diff --git a/fhem/Makefile b/fhem/Makefile
index d925bf24c..829d19856 100644
--- a/fhem/Makefile
+++ b/fhem/Makefile
@@ -4,13 +4,6 @@ VARDIR=/var/log/fhem
 MANDIR=/usr/share/man/man1
 ETCDIR=/etc
 
-BINDIR=/tmp/fhem/usr/bin
-MODDIR=/tmp/fhem/usr/share/fhem
-VARDIR=/tmp/fhem/var/log/fhem
-MANDIR=/tmp/fhem/usr/share/man/man1
-ETCDIR=/tmp/fhem/etc
-
-
 # Used for .deb package creation
 RBINDIR=$(ROOT)$(BINDIR)
 RMODDIR=$(ROOT)$(MODDIR)
@@ -83,8 +76,9 @@ uninstall:backup
 
 dist:
 	mkdir .f
-	cp -r CHANGED FHEM HISTORY Makefile README.SVN\
-		contrib docs examples fhem.pl webfrontend .f
+	cp -r fhem.pl fhem.cfg CHANGED HISTORY Makefile README.SVN\
+		FHEM contrib docs www webfrontend .f
+	mkdir .f/log
 	find .f -name .svn -print | xargs rm -rf
 	find .f -name \*.orig -print | xargs rm -f
 	find .f -name .#\* -print | xargs rm -f
@@ -120,7 +114,7 @@ deb:
 	rm -rf $(DESTDIR)
 
 fb7390:
-	cd contrib/FB7390 && ./makeimage $(DESTDIR)
+	cd contrib/FB7390 && sh ./makeimage $(DESTDIR)
 
 fb7270:
 	cd contrib/FB7270 && ./makeimage $(DESTDIR)
diff --git a/fhem/contrib/FB7390/makeimage b/fhem/contrib/FB7390/makeimage
index b8ba7dcc2..87c6e978c 100755
--- a/fhem/contrib/FB7390/makeimage
+++ b/fhem/contrib/FB7390/makeimage
@@ -8,48 +8,30 @@ if test ! -f ../../$fw.tar.gz; then
 fi
 
 rm -rf var
-echo Extracting the fritzbox template
 tar xf ../../priv/fritzbox7390_template.tar
+
 cd var
 tar zxf fhem.tar.gz
-rm -rf fhem/FHEM
-mkdir fhem/FHEM
+rm -rf fhem/{FHEM,www,docs}
 cd ..
 
+rm -rf $fw
+tar zxf ../../$fw.tar.gz
+
+cd $fw
+cp -rp fhem.pl fhem.cfg FHEM docs www ../var/fhem
+cd ..
+
+rm -rf $fw
+rm -rf var/fhem/docs/*.{odg,pdf,man,txt}
 cp install var
 cp startfhem var/fhem
 cp fhemcmd.sh var/fhem/FHEM
 
-
-echo Extracting $fw
-rm -rf $fw
-tar zxf ../../$fw.tar.gz
-cd $fw
-cp fhem.pl ../var/fhem
-cp FHEM/*\
-        webfrontend/pgm2/*\
-        docs/*.html\
-        docs/fhem.png\
-        docs/*.jpg\
-        ../var/fhem/FHEM
-
-cd examples
-for i in *; do
-   cp -r $i ../../var/fhem/FHEM/example.$i
-done
-cd ../..
-rm -rf $fw
-
-
-echo Packing again
-cd var/fhem
-cp FHEM/example.sample_pgm2 fhem.cfg
-perl -pi -e 's,/tmp,./log,g' fhem.cfg
-
-cd ..
+cd var
 tar zcf fhem.tar.gz fhem
 rm -rf fhem
-
 cd ..
+
 tar cf $fw-fb7390.image var
 rm -rf var