diff --git a/configure.in b/configure.in
index 14224b0..d18b72b 100644
--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@ AC_SUBST(LEAST)
 AC_MSG_CHECKING(QT4 directory)
 QTDIR="no"
 AC_ARG_WITH([qt-dir],
-             AC_HELP_STRING([--with-qt-dir=/path/to/Qt4/include],
+             AC_HELP_STRING([--with-qt-dir=/path/to/Qt4],
                             [to specify the path to the Qt4 directory.]),
              [QTPATHS="$withval"],
              [QTPATHS="/usr/include/qt4 /usr/local/include/qt4 /opt/include/qt4 /opt/local/include/qt4 /opt/local/libexec/qt4-mac/include /usr/include /usr/local/include /opt/include /opt/local/include"])
@@ -75,18 +75,14 @@ else
   # by now, Linux/Unix always uses libproxy
   case $host in
     *darwin*)
-      CPPFLAGS+=" -DQ_OS_MAC -F$QTINCDIR"
-      #LDFLAGS+=" -F$QTLIBDIR -framework QtCore -framework QtNetwork -framework QtGui"
-      LDFLAGS+=" -F$QTLIBDIR -L/opt/local/lib -lQtCore -lQtNetwork -lQtGui"
+      LDFLAGS+=" -L$QTLIBDIR -lQtCore -lQtNetwork -lQtGui"
       ;;
     *mingw*|*win*)
       LDFLAGS+=" -L$QTLIBDIR -lQtCore4 -lQtNetwork4 -lQtGui4"
-      CPPFLAGS+=" -DQ_OS_WIN32"
       ;;
     *)
       LDFLAGS+=" -L$QTLIBDIR -lQtCore -lQtNetwork -lQtGui"
       LDFLAGS+=" -lproxy"
-      CPPFLAGS+=" -DQ_OS_LINUX"
       ;;
   esac
   CPPFLAGS+=" -DUNICODE -DQT_NO_DEBUG"
diff --git a/install-32-bit-lin-win.sh b/install-32-bit-lin-win.sh
index 6adc597..4eaf89b 100755
--- a/install-32-bit-lin-win.sh
+++ b/install-32-bit-lin-win.sh
@@ -1,14 +1,13 @@
 ./bootstrap.sh && \
-    LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \
-    CPPFLAGS="-I/opt/local/i586-mingw32msvc/include -DQ_OS_WIN32" \
-    ./configure \
-    --with-qt-dir=/usr/local/trolltech/qt-mingw32/include \
-    --prefix=/opt/local/i586-mingw32msvc \
-    --build=x86_64 \
-    --host=i586-mingw32msvc && \
-    make && \
-    sudo make install && \
-    make clean && \
-    ./configure --with-qt-dir=/usr/local/trolltech/qt/include && \
-    make check && \
-    sudo make install
+LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \
+  CPPFLAGS="-I/opt/local/i586-mingw32msvc/include -DQ_OS_WIN32" \
+  ./configure \
+  --prefix=/opt/local/i586-mingw32msvc \
+  --build=x86_64 \
+  --host=i586-mingw32msvc && \
+make && \
+sudo make install && \
+make clean && \
+./configure && \
+make check && \
+sudo make install
diff --git a/install-64-and-32-bit-linux.sh b/install-64-and-32-bit-linux.sh
index 4e620f1..6d3f8a2 100755
--- a/install-64-and-32-bit-linux.sh
+++ b/install-64-and-32-bit-linux.sh
@@ -7,7 +7,7 @@ make && \
 sudo make install && \
 make clean && \
 LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \
-  CPPFLAGS="-I/opt/local/i586-mingw32msvc/include" \
+  CPPFLAGS="-I/opt/local/i586-mingw32msvc/include -DQ_OS_WIN32" \
   ./configure \
   --prefix=/opt/local/i586-mingw32msvc \
   --build=x86_64 \