diff --git a/mkxcapro.sh b/mkxcapro.sh
index bb89f453..a45fadc8 100755
--- a/mkxcapro.sh
+++ b/mkxcapro.sh
@@ -1,22 +1,31 @@
 #!/bin/sh
 
 P=xca.pro
-W=win.bat
+W1=win.bat
+W=win.tmp
 
 if [ -e Makefile ]; then
 	make distclean
 fi
 
+echo -n "Creating $P ..."
 FORMS=`ls *.ui`
-SOURCES="`ls *.cpp` `ls lib/*.cpp`"
 HEADERS="`ls *.h` `ls lib/*.h` "
 
-echo "HEADERS=$HEADERS" >$P
-echo "SOURCES=$SOURCES" >>$P
-echo "FORMS=$FORMS" >>$P
-echo "TRANSLATIONS="`ls xca_??.ts` >>$P
-echo "TARGET=xca" >>$P
+echo "HEADERS = "`ls *.h` `ls lib/*.h`  >$P
+echo "SOURCES = "`ls *.cpp` `ls lib/*.cpp` >>$P
+echo "FORMS = "`ls *.ui` >>$P
+echo "TRANSLATIONS = "`ls xca_??.ts` >>$P
+echo "TARGET = xca" >>$P
+echo "DEFINES += QT_DLL QT_THREAD_SUPPORT" >>$P
+echo "CONFIG = qt warn_on release" >>$P
+echo "TEMPLATE = app" >> $P
 
+
+echo "  done"
+
+
+echo -n "Creating $W ..."
 rm -f $W
 
 for F in $FORMS; do 
@@ -28,7 +37,12 @@ done
 for F in $HEADERS; do
 	grep Q_OBJECT $F >/dev/null 2>&1
 	if [ $? -eq 0 ]; then
-		B=`echo $F |cut -d "." -f 1`
-		echo moc -o moc_${B}.cpp ${F} >> $W
+		B=`basename $F |cut -d "." -f 1`
+		C=`dirname $F`/
+		if [ "$C" == "./" ]; then C=""; fi
+		echo moc -o ${C}moc_${B}.cpp ${F} >> $W
 	fi
 done
+cat $W |perl -e 'while(<STDIN>){chomp;print"$_\r\n";}' >$W1
+rm -f $W
+echo "  done"
diff --git a/xca.pro b/xca.pro
index 98358b5f..32f02476 100644
--- a/xca.pro
+++ b/xca.pro
@@ -1,50 +1,8 @@
-HEADERS=CertDetail_UI.h
-ExportKey.h
-KeyDetail_UI.h
-MainWindow.h
-NewKey_UI.h
-NewX509.h
-PassRead_UI.h
-PassWrite_UI.h
-ReqDetail_UI.h
-TrustState_UI.h lib/db_base.h
-lib/db_key.h
-lib/db_temp.h
-lib/db_x509.h
-lib/db_x509req.h
-lib/pki_base.h
-lib/pki_key.h
-lib/pki_pkcs12.h
-lib/pki_temp.h
-lib/pki_x509.h
-lib/pki_x509req.h 
-SOURCES=ExportKey.cpp
-MainWindow.cpp
-MainWindowKeys.cpp
-MainWindowTemps.cpp
-MainWindowX509.cpp
-MainWindowX509Req.cpp
-NewX509.cpp
-main.cpp lib/db_base.cpp
-lib/db_key.cpp
-lib/db_temp.cpp
-lib/db_x509.cpp
-lib/db_x509req.cpp
-lib/pki_base.cpp
-lib/pki_key.cpp
-lib/pki_pkcs12.cpp
-lib/pki_temp.cpp
-lib/pki_x509.cpp
-lib/pki_x509req.cpp
-FORMS=CertDetail.ui
-ExportKey_UI.ui
-KeyDetail.ui
-MainWindow_UI.ui
-NewKey.ui
-NewX509_UI.ui
-PassRead.ui
-PassWrite.ui
-ReqDetail.ui
-TrustState.ui
-TRANSLATIONS=xca_de.ts xca_es.ts
-TARGET=xca
+HEADERS = ExportKey.h MainWindow.h NewX509.h lib/db_base.h lib/db_key.h lib/db_temp.h lib/db_x509.h lib/db_x509req.h lib/pki_base.h lib/pki_key.h lib/pki_pkcs12.h lib/pki_temp.h lib/pki_x509.h lib/pki_x509req.h
+SOURCES = ExportKey.cpp MainWindow.cpp MainWindowKeys.cpp MainWindowTemps.cpp MainWindowX509.cpp MainWindowX509Req.cpp NewX509.cpp main.cpp lib/db_base.cpp lib/db_key.cpp lib/db_temp.cpp lib/db_x509.cpp lib/db_x509req.cpp lib/pki_base.cpp lib/pki_key.cpp lib/pki_pkcs12.cpp lib/pki_temp.cpp lib/pki_x509.cpp lib/pki_x509req.cpp
+FORMS = CertDetail.ui ExportKey_UI.ui KeyDetail.ui MainWindow_UI.ui NewKey.ui NewX509_UI.ui PassRead.ui PassWrite.ui ReqDetail.ui TrustState.ui
+TRANSLATIONS = xca_de.ts xca_es.ts
+TARGET = xca
+DEFINES += QT_DLL QT_THREAD_SUPPORT
+CONFIG = qt warn_on release
+TEMPLATE = app