diff --git a/Changes b/Changes
index 02eaf1341..7acf31209 100644
--- a/Changes
+++ b/Changes
@@ -617,3 +617,4 @@ seen. gmtime warning still there
 - Fixed a bug allowing channek keys to have spaces
 - Cleaned up some thread porting code
 - Added a new versioning system to allow easy tracking of bugs
+- Fixed makeconf
diff --git a/makeconf b/makeconf
index 68d3bc128..82eb34a33 100755
--- a/makeconf
+++ b/makeconf
@@ -56,8 +56,8 @@ fi
 
 # If Settings exist, load the info, otherwise tell them to run Config.
 
-if [ -r Settings ]; then
-	. Settings
+if [ -r "config.settings" ]; then
+	. config.settings
 else
 	echo "Hmm, you need to run Config first!"
 	echo "Type ./Config"
@@ -65,10 +65,9 @@ else
 	echo "you ran it from."
 	exit 1
 fi
-
 # we use a modified mkpasswd credit to Nelson Minar (minar@reed.edu)
 # for creating the original mkpasswd
-if test $CRYPT_OPER_PASSWORD != "" || test $CRYPT_LINK_PASSWORD != "" || test $CRYPT_XLINE_PASSWORD != "" ; then
+if test "x$CRYPT_OPER_PASSWORD" != "x" -o "x$CRYPT_LINK_PASSWORD" != "x" -o "x$CRYPT_XLINE_PASSWORD" != "x" ; then
 		cat > crypter.tmp.c << __EOF__
 			#include <stdlib.h>
 			#include <stdio.h>