diff --git a/CHANGELOG b/CHANGELOG
index fab2c2e..1f60641 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,19 @@ Ideas for future versions:
   Solaris (and possibly other platforms)
 - Perhaps change to SVG for objects
 
+Version 1.7h:
+- Fixed crash when moving link points
+
+Version 1.7g:
+- "Create map link" screen is now scrollable with ,/./q/w keys
+- Fix bug with font file location - now searches $NETMAPRDIR for it once more.
+w no longer prints messages at startup.
+
+Version 1.7f:
+- Now no longer prints messages at startup.
+- Fixed numerous crashes (graphics functions now check for out of bounds
+  coordinates)
+
 Version 1.7e:
 - Fixed memory leaks
 - Fixed 100% CPU usage bug
diff --git a/constants.h b/constants.h
index 0080999..8f2e60d 100644
--- a/constants.h
+++ b/constants.h
@@ -1,4 +1,4 @@
-#define VERSION "1.7g"
+#define VERSION "1.8"
 
 /* variable sizes */
 #define SMALLBUFLEN 64		/* small text buffer */
diff --git a/dist.sh b/dist.sh
index 0b5536a..e2eaef6 100755
--- a/dist.sh
+++ b/dist.sh
@@ -9,6 +9,7 @@ mkdir ${FULLNAME}
 cp README.txt INSTALL.txt Makefile.linux Makefile.freebsd Makefile.windows objects.dat buttons.dat netmapr.c netmapr.h constants.h convert.c convert.h icon.bmp verdana.ttf example.map ${FULLNAME}/
 cp -R doc ${FULLNAME}/
 rm -rf ${FULLNAME}/doc/CVS
+rm -rf ${FULLNAME}/doc/.svn
 tar zcvf ${TARFILE} ${FULLNAME}
 rm -rf ${FULLNAME}
 
@@ -17,5 +18,6 @@ mkdir ${FULLNAME}
 cp README.txt INSTALL.txt objects.dat buttons.dat netmapr.exe netmapr.c netmapr.h constants.h convert.c convert.h verdana.ttf example.map icon.bmp windows_files/*.dll ${FULLNAME}/
 cp -R doc ${FULLNAME}/
 rm -rf ${FULLNAME}/doc/CVS
+rm -rf ${FULLNAME}/doc/.svn
 zip -r ${WINFILE} ${FULLNAME}
 rm -rf ${FULLNAME}
diff --git a/netmapr.c b/netmapr.c
index 09009a6..05f1336 100644
--- a/netmapr.c
+++ b/netmapr.c
@@ -8582,7 +8582,10 @@ int endlinkdstmove(int x, int y) {
 
 int endlinkpointmove(int x, int y) {
 	/* free variable */
-	if (bg) free(bg);
+	if (bg) {
+		SDL_FreeSurface(bg);
+		bg = NULL;
+	}
 
 
 	/* adjust for grid */