diff --git a/src/Makefile b/src/Makefile
index 085d31366..c1ce60994 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -24,6 +24,8 @@ SNAPSHOT_DIR=GF-$(shell date +%Y%m%d)
 
 MSI_FILE=gf-$(subst .,_,$(PACKAGE_VERSION)).msi
 
+GF_DATA_DIR=$(datadir)/GF-$(PACKAGE_VERSION)
+
 # use the temporary binary file name 'gf-bin' to not clash with directory 'GF' 
 # on case insensitive file systems (such as FAT)
 GF_EXE=gf$(EXEEXT)
@@ -232,11 +234,11 @@ install-gfdoc:
 	$(INSTALL) tools/$(GF_DOC_EXE) $(bindir)
 
 install-editor:
-	$(INSTALL) -d $(datadir)/GF-$(PACKAGE_VERSION)
+	$(INSTALL) -d $(GF_DATA_DIR)
 	$(INSTALL) jgf $(bindir)
-	$(INSTALL) -m 0644 JavaGUI/gf-java.jar $(datadir)/GF-$(PACKAGE_VERSION)
+	$(INSTALL) -m 0644 JavaGUI/gf-java.jar $(GF_DATA_DIR)
 	$(INSTALL) gfeditor $(bindir)
-	$(INSTALL) -m 0644 $(GFEDITOR)/gfeditor.jar $(datadir)/GF-$(PACKAGE_VERSION)
+	$(INSTALL) -m 0644 $(GFEDITOR)/gfeditor.jar $(GF_DATA_DIR)
 
 install-java: javac
 	-rm -f ../bin/JavaGUI
@@ -244,4 +246,3 @@ install-java: javac
 	@echo "PLEASE edit GFHOME in bin/jgf"
 	-rm -f ../bin/$(GFEDITOR)
 	ln -s ../src/$(GFEDITOR) ../bin
-
diff --git a/src/gfeditor.in b/src/gfeditor.in
index 9a390195b..129cd5e1f 100644
--- a/src/gfeditor.in
+++ b/src/gfeditor.in
@@ -1,26 +1,32 @@
 #!/bin/sh
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-GF_BIN_DIR=@bindir@
-GF_DATA_DIR=@datadir@/GF-@PACKAGE_VERSION@
+prefix="@prefix@"
+
+case "@host@" in
+      *-cygwin)
+          prefix=`cygpath -w "$prefix"`;;
+esac
+
+exec_prefix="@exec_prefix@"
+GF_BIN_DIR="@bindir@"
+GF_DATA_DIR="@datadir@/GF-@PACKAGE_VERSION@"
 
 JAVA="@JAVA@"
 
-GF=$GF_BIN_DIR/gf
-JARFILE=$GF_DATA_DIR/gfeditor.jar
+GF="$GF_BIN_DIR/gf"
+JARFILE="$GF_DATA_DIR/gfeditor.jar"
 
 if [ ! -x "${JAVA}" ]; then
     JAVA=`which java`
 fi
 
 if [ ! -x "${JAVA}" ]; then
-    echo "No Java VM found"
+    echo "No Java VM found."
     exit 1
 fi
 
-if [ ! -f "${JARFILE}" ]; then
-   echo "JAR file ${JARFILE} not found"
+if [ ! -r "${JARFILE}" ]; then
+   echo "Cannot read JAR file ${JARFILE}."
    exit 1
 fi
 
@@ -29,11 +35,8 @@ if [ ! -x "${GF}" ]; then
 fi
 
 if [ ! -x "${GF}" ]; then
-    echo "gf not found"
+    echo "GF not found."
     exit 1
 fi
 
-COMMAND= ${JAVA} -jar ${JARFILE} -g $GF $*
-
-echo ${COMMAND}
-exec ${COMMAND}
+exec "${JAVA}" -jar "${JARFILE}" -g "${GF}" $*
diff --git a/src/jgf.in b/src/jgf.in
index b82e1fd73..3df121a64 100644
--- a/src/jgf.in
+++ b/src/jgf.in
@@ -1,26 +1,32 @@
 #!/bin/sh
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-GF_BIN_DIR=@bindir@
-GF_DATA_DIR=@datadir@/GF-@PACKAGE_VERSION@
+prefix="@prefix@"
+
+case "@host@" in
+      *-cygwin)
+          prefix=`cygpath -w "$prefix"`;;
+esac
+
+exec_prefix="@exec_prefix@"
+GF_BIN_DIR="@bindir@"
+GF_DATA_DIR="@datadir@/GF-@PACKAGE_VERSION@"
 
 JAVA="@JAVA@"
 
-GF=$GF_BIN_DIR/gf
-JARFILE=$GF_DATA_DIR/gf-java.jar
+GF="$GF_BIN_DIR/gf"
+JARFILE="$GF_DATA_DIR/gf-java.jar"
 
 if [ ! -x "${JAVA}" ]; then
     JAVA=`which java`
 fi
 
 if [ ! -x "${JAVA}" ]; then
-    echo "No Java VM found"
+    echo "No Java VM found."
     exit 1
 fi
 
-if [ ! -f "${JARFILE}" ]; then
-   echo "JAR file ${JARFILE} not found"
+if [ ! -r "${JARFILE}" ]; then
+   echo "Cannot read JAR file ${JARFILE}."
    exit 1
 fi
 
@@ -29,11 +35,8 @@ if [ ! -x "${GF}" ]; then
 fi
 
 if [ ! -x "${GF}" ]; then
-    echo "gf not found"
+    echo "GF not found."
     exit 1
 fi
 
-COMMAND= ${JAVA} -jar ${JARFILE} "$GF -java $*"
-
-echo ${COMMAND}
-exec ${COMMAND}
+exec "${JAVA}" -jar "${JARFILE}" "$GF -java $*"