diff --git a/configure.in b/configure.in
index 33ad824a99..b329ac4abb 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_INIT
 AM_INIT_AUTOMAKE(tor, 0.0.2pre14)
 AM_CONFIG_HEADER(orconfig.h)
 
-CFLAGS="$CFLAGS -Wall -O2 -I/usr/kerberos/include"
+CFLAGS="$CFLAGS -Wall -g -O2 -I/usr/kerberos/include"
 
 AC_ARG_ENABLE(debug,
 [  --enable-debug          compiles with debugging info],
@@ -36,8 +36,8 @@ AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [
         for ssldir in $tryssldir "" /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
                 CPPFLAGS="$saved_CPPFLAGS"
                 LDFLAGS="$saved_LDFLAGS"
-                LIBS="$saved_LIBS -lcrypto -lssl"
-                
+                LIBS="$saved_LIBS -lssl -lcrypto"
+
                 # Skip directories if they don't exist
                 if test ! -z "$ssldir" -a ! -d "$ssldir" ; then
                         continue;
@@ -126,7 +126,7 @@ if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ;
                 fi
         fi
 fi
-LIBS="$saved_LIBS -lcrypto -lssl"
+LIBS="$saved_LIBS -lssl -lcrypto"
 
 dnl The warning message here is no longer strictly accurate.