diff --git a/src/JavaGUI/manifest.txt b/src/JavaGUI/manifest.txt
new file mode 100644
index 000000000..006d8adfd
--- /dev/null
+++ b/src/JavaGUI/manifest.txt
@@ -0,0 +1 @@
+Main-Class: GFEditor2
diff --git a/src/Makefile b/src/Makefile
index 7286805fb..d8fe5b969 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,6 +13,8 @@ GHCINCLUDENOFUD=-ifor-ghc-nofud $(BASICINCLUDE)
 GHCINCLUDEGFT  =-ifor-gft       $(BASICINCLUDE) 
 WINDOWSINCLUDE =-ifor-windows   $(BASICINCLUDE) 
 
+DIST_DIR=GF-$(PACKAGE_VERSION)
+
 all: unix
 
 unix: today nofud-links opt
@@ -67,9 +69,11 @@ shell:
 	$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) Shell.hs
 clean: 
 	-rm -rf */*.o */*.hi *.o *.hi */*.ghi *.ghi *~ */*~
+	-rm -f java/*.class
 
 distclean: clean
 	-rm -f for-ghc-nofud/*.hs
+	-rm -f java/gf-java.jar jgf2
 	-rm -f config.status config.mk config.log
 
 hugs:
@@ -80,6 +84,10 @@ today:
 	util/mktoday.sh
 javac:
 	javac java/*.java
+
+jar: javac
+	cd java; jar -cmf manifest.txt gf-java.jar *.class
+
 help:
 	cd util ; runhugs MkHelpFile ; mv HelpFile.hs .. ; cd ..
 
@@ -89,5 +97,19 @@ tracing:
 	strip gf2
 	mv gf2 ../bin/
 
+dist:
+	mkdir $(DIST_DIR)
+	cvs export -d $(DIST_DIR) -rHEAD GF2.0
+	cd $(DIST_DIR) && autoconf && rm -rf autom4te.cache
+	find $(DIST_DIR) -name .cvsignore -exec rm -f {} ';'
+	tar -zcf $(DIST_DIR).tar.gz $(DIST_DIR)
+	zip -r $(DIST_DIR).zip $(DIST_DIR)
+	rm -rf $(DIST_DIR)
+
+
 install:
+	$(INSTALL) -d $(bindir)
+	$(INSTALL) -d $(libdir)/GF-$(PACKAGE_VERSION)
 	$(INSTALL) ../bin/gf2 $(bindir)
+	$(INSTALL) jgf2 $(bindir)
+	$(INSTALL) java/gf-java.jar $(libdir)/GF-$(PACKAGE_VERSION)
diff --git a/src/config.mk.in b/src/config.mk.in
index 614902d5b..cd55a46c8 100644
--- a/src/config.mk.in
+++ b/src/config.mk.in
@@ -1,6 +1,12 @@
+# GF configuration file. configure will produce config.mk from this file
+# @configure_input@
+
+PACKAGE_VERSION = @PACKAGE_VERSION@
+
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-bindir = $(exec_prefix)/bin
+bindir = @bindir@
+libdir = @libdir@
 
 INSTALL = @INSTALL@
 
diff --git a/src/configure.ac b/src/configure.ac
index 4734aa4ce..08b0a85a4 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4,9 +4,9 @@ AC_INIT([GF],[2.0],[dp03-7@mdstud.chalmers.se],[GF])
 
 AC_PREREQ(2.53)
 
-AC_REVISION($Revision: 1.1 $)
+AC_REVISION($Revision: 1.2 $)
 
-AC_CONFIG_FILES([config.mk])
+AC_CONFIG_FILES([config.mk jgf2])
 
 AC_CANONICAL_SYSTEM
 
diff --git a/src/gf.spec b/src/gf.spec
index d2a025011..24c40505b 100644
--- a/src/gf.spec
+++ b/src/gf.spec
@@ -49,7 +49,7 @@ rm -rf $RPM_BUILD_ROOT
 %build
 cd src
 %configure
-make today opt
+make unix
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,6 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,0755)
 %{_bindir}/gf2
+%{_bindir}/jgf2
+%{_libdir}/%{name}-%{version}/gf-java.jar
 %doc LICENSE README doc/{DocGF.pdf,gf2-highlights.html,index.html,release2.html}
 
 
diff --git a/src/jgf2.in b/src/jgf2.in
new file mode 100644
index 000000000..046d1349c
--- /dev/null
+++ b/src/jgf2.in
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+GF_BIN_DIR=@bindir@
+GF_LIB_DIR=@libdir@/GF-@PACKAGE_VERSION@
+
+GF=$GF_BIN_DIR/gf2
+JARFILE=$GF_LIB_DIR/gf-java.jar
+
+java -jar $JARFILE "$GF -java $*"
\ No newline at end of file