diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32.java
index 2cf8bf955..0ee7a6bc5 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32.java
@@ -96,4 +96,22 @@ class FS_Win32 extends FS {
 
 		return null;
 	}
+
+	@Override
+	protected File userHomeImpl() {
+		String home = SystemReader.getInstance().getenv("HOME");
+		if (home != null)
+			return resolve(null, home);
+		String homeDrive = SystemReader.getInstance().getenv("HOMEDRIVE");
+		if (homeDrive != null) {
+			String homePath = SystemReader.getInstance().getenv("HOMEPATH");
+			return new File(homeDrive, homePath);
+		}
+
+		String homeShare = SystemReader.getInstance().getenv("HOMESHARE");
+		if (homeShare != null)
+			return new File(homeShare);
+
+		return super.userHomeImpl();
+	}
 }