diff --git a/BasiliskII/BasiliskII.spec b/BasiliskII/BasiliskII.spec
index 23f4563a..ee40178d 100644
--- a/BasiliskII/BasiliskII.spec
+++ b/BasiliskII/BasiliskII.spec
@@ -1,7 +1,7 @@
 Summary:   A free, portable Mac II emulator
 Name:      BasiliskII
 Version:   0.7
-Release:   1
+Release:   2
 URL:       http://www.uni-mainz.de/~bauec002/B2Main.html
 Source:    BasiliskII_src_03101999.tar.gz
 Copyright: GPL
@@ -45,8 +45,3 @@ make install
 /usr/X11R6/bin/BasiliskII
 /usr/man/man1/BasiliskII.1
 /usr/share/BasiliskII/keycodes
-
-%changelog
-* Fri Jul 23 1999 Roman Niewiarowski <newrom@pasjo.net.pl>
-  [0.6-1]
-- First rpm release
diff --git a/BasiliskII/ChangeLog b/BasiliskII/ChangeLog
index 581720f5..d2e8f5d4 100644
--- a/BasiliskII/ChangeLog
+++ b/BasiliskII/ChangeLog
@@ -1,8 +1,12 @@
 V0.7 (alpha)
 	- Source tree imported into CVS
+	- Added BasiliskII.spec file and top-level Makefile to simplify
+	  making distributions [with assistance from Roman Niewiarowski]
 	- Unix: "basilisk_ii_keycodes" renamed to "keycodes", default
 	  location of keycodes file is now /usr/local/share/BasiliskII/keycodes
-	- Unix: improved the install target
+	- Unix: improved the install target, added uninstall target
+	- Unix/Linux/NetDriver: removed MAKEDEV, functionality now included
+	  in Makefile ("make dev")
 	- Unix/sys_unix.cpp: Sys_open() checks whether an HFS volume is currently
 	  mounted under Linux and tries to unmount it
 	- Unix/sys_unix.cpp: implemented SysAddDiskPrefs() for Linux (scans
@@ -10,6 +14,11 @@ V0.7 (alpha)
 	- Unix/sys_unix.cpp: implemented Sys(Prevent/Allow)Removal() [Ryan Cumming]
 	- Unix/main_unix.cpp: added call to gtk_set_locale() before gtk_init()
 	  [Toshimitsu Tanaka]
+	- Unix/video_x.cpp: "dga" screen preferences now takes width and
+	  height as parameters (e.g. dga/640/480), like "win" [Pablo Averbuj]
+	- Unix/video_x.cpp: Caps Lock behaves as expected [Pablo Averbuj]
+	- Unix/prefs_editor_gtk.cpp: made the window width/height widgets
+	  comboboxes providing some useful defaults
 
 V0.7 (alpha) - 25.Jul.1999
 	- with 32-bit clean ROMs, the CPU type is now reported as a 68030
diff --git a/BasiliskII/INSTALL b/BasiliskII/INSTALL
index b2b59449..ded26dcd 100644
--- a/BasiliskII/INSTALL
+++ b/BasiliskII/INSTALL
@@ -69,13 +69,13 @@ Unix:
   To use Ethernet networking under Linux, you either have to configure your
   kernel for ethertap support or make and install the "sheep_net" driver:
 
-    cd src/Unix
     make modules
 
   This should produce a kernel module "sheep_net.o" in the "Linux/NetDriver"
   directory. Now su root and say
 
-    ./MAKEDEV
+    cd Linux/NetDriver
+    make dev
     /sbin/insmod sheep_net.o
 
   This will install the device node "/dev/sheep_net" and load the driver.
diff --git a/BasiliskII/Makefile b/BasiliskII/Makefile
index 9086b618..01766676 100644
--- a/BasiliskII/Makefile
+++ b/BasiliskII/Makefile
@@ -1,15 +1,19 @@
 # Makefile for creating Basilisk II distributions
 # Written in 1999 by Christian Bauer <Christian.Bauer@uni-mainz.de>
 
-VERSION = $(shell grep '^Version' <BasiliskII.spec | sed 's/Version: *//')
+VERSION = $(shell sed <BasiliskII.spec -n '/^Version: */s///p')
+RELEASE = $(shell sed <BasiliskII.spec -n '/^Release: */s///p')
 
 SRCARCHIVE = $(shell date +BasiliskII_src_%d%m%Y.tar.gz)
-AMIGAARCHIVE = $(shell date +BasiliskII_amiga_%d%m%Y.lha)
-BEOSPPCARCHIVE = $(shell date +BasiliskII_beos_ppc_%d%m%Y.zip)
-BEOSX86ARCHIVE = $(shell date +BasiliskII_beos_x86_%d%m%Y.zip)
+SRCRPM = BasiliskII-$(VERSION)-$(RELEASE).src.rpm
+I386RPM = BasiliskII-$(VERSION)-$(RELEASE).i386.rpm
+AMIGAARCHIVE = BasiliskII-$(VERSION)-$(RELEASE).amiga.lha
+BEOSPPCARCHIVE = BasiliskII-$(VERSION)-$(RELEASE).beosppc.zip
+BEOSX86ARCHIVE = BasiliskII-$(VERSION)-$(RELEASE).beosx86.zip
 
 BUILDDIR = /tmp/build
-DOCS = ChangeLog COPYING INSTALL README TECH TODO
+RPMDIR = /usr/src/redhat
+DOCS = $(shell sed <BasiliskII.spec -n '/^\%doc */s///p')
 SRCS = src
 
 default:
@@ -22,11 +26,16 @@ default:
 help:
 	@echo "The following targets are available:"
 	@echo "  tarball  source tarball ($(SRCARCHIVE))"
-	@echo "  rpm      source and binary RPMs"
+	@echo "  rpm      source and binary RPMs ($(SRCRPM) and $(I386RPM))"
 	@echo "  amiga    AmigaOS binary archive ($(AMIGAARCHIVE))"
 	@echo "  beosppc  BeOS/ppc binary archive ($(BEOSPPCARCHIVE))"
 	@echo "  beosx86  BeOS/x86 binary archive ($(BEOSX86ARCHIVE))"
 
+clean:
+	-rm -f $(SRCARCHIVE)
+	-rm -f $(SRCRPM)
+	-rm -f $(AMIGAARCHIVE) $(BEOSPPCARCHIVE) $(BEOSX86ARCHIVE)
+
 #
 # Source tarball
 #
@@ -43,13 +52,21 @@ $(SRCARCHIVE): $(SRCS) $(DOCS)
 	rm -rf $(BUILDDIR)
 
 #
-# RPMs
+# RPMs (source and i386 binary)
 #
-rpm: /usr/src/redhat/SOURCES/$(SRCARCHIVE) BasiliskII.spec
+rpm: $(SRCRPM) $(I386RPM)
+
+$(RPMDIR)/SOURCES/$(SRCARCHIVE): $(SRCARCHIVE)
+	cp $(SRCARCHIVE) $(RPMDIR)/SOURCES
+
+$(RPMDIR)/SRPMS/$(SRCRPM) $(RPMDIR)/RPMS/i386/$(I386RPM): $(RPMDIR)/SOURCES/$(SRCARCHIVE) BasiliskII.spec
 	rpm -ba BasiliskII.spec
 
-/usr/src/redhat/SOURCES/$(SRCARCHIVE): $(SRCARCHIVE)
-	cp $(SRCARCHIVE) /usr/src/redhat/SOURCES
+$(SRCRPM): $(RPMDIR)/SRPMS/$(SRCRPM)
+	cp $(RPMDIR)/SRPMS/$(SRCRPM) .
+
+$(I386RPM): $(RPMDIR)/RPMS/i386/$(I386RPM)
+	cp $(RPMDIR)/RPMS/i386/$(I386RPM) .
 
 #
 # Binary archive for AmigaOS
diff --git a/BasiliskII/README b/BasiliskII/README
index 8a9e0895..63369572 100644
--- a/BasiliskII/README
+++ b/BasiliskII/README
@@ -198,11 +198,13 @@ screen <video mode>
         Color display in an X11 window of the given size. The color depth
         (8/15/24 bit) depends on the depth of the underlying X11 screen.
         This is the default.
-      dga
+      dga/<width>/<height>
         Full-screen display using the X11 DGA extensions. The color depth
         (8/15/24 bit) depends on the depth of the underlying X11 screen.
-        For DGA to work, Basilisk II must be compiled with DGA support
-        enabled (selectable in the configure script).
+        "width" and "height" specify the maximum width/height to use.
+        Saying "dga/0/0" means "complete screen". For DGA to work, Basilisk II
+        must be compiled with DGA support enabled (selectable in the configure
+        script).
 
   AmigaOS:
     The "video mode" is one of the following: