diff --git a/Makefile b/Makefile
index fb90d09a..51ea1286 100644
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,10 @@ all: headers xca$(SUFFIX) doc lang
 re: clean all
 
 xca.o: $(OBJECTS)
-	$(LD) $(OBJECTS) $(SLIBS) -r -o $@
+	$(LD)  $(LDFLAGS) $(OBJECTS) -r -o $@ $(SLIBS)
 
 xca$(SUFFIX): xca.o
-	$(CC) $(LDFLAGS) $(CFLAGS) $< $(LIBS) -o $@
+	$(CC) -static $(LDFLAGS) $(CFLAGS) $< $(LIBS) -o $@
 
 doc: 
 	$(MAKE) -C doc
diff --git a/lib/db_base.h b/lib/db_base.h
index c41a7cd0..d61c9aa3 100644
--- a/lib/db_base.h
+++ b/lib/db_base.h
@@ -62,8 +62,8 @@ class db_base: public QAbstractItemModel
 		QPixmap *loadImg(const char *name);
 		void writeAll(void);
 		void dump(QString dirname);
-		virtual void showContextMenu(QContextMenuEvent * e,
-				const QModelIndex &index){};
+		virtual void showContextMenu(QContextMenuEvent * ,
+				const QModelIndex &) {};
 
 		QModelIndex index(int row, int column, const QModelIndex &parent)const;
 		QModelIndex index(pki_base *pki)const;
@@ -87,7 +87,7 @@ class db_base: public QAbstractItemModel
 		void edit();
 		virtual void showItem();
 		virtual void store(){};
-		virtual void showPki(pki_base *pki) { };
+		virtual void showPki(pki_base *) {};
 		virtual void showItem(const QModelIndex &index);
 		virtual void showItem(const QString keyname);
 
diff --git a/lib/load_obj.cpp b/lib/load_obj.cpp
index 3384a59f..a13639ff 100644
--- a/lib/load_obj.cpp
+++ b/lib/load_obj.cpp
@@ -20,7 +20,7 @@ load_base::load_base()
 	caption = "";
 }
 
-pki_base * load_base::loadItem(QString s)
+pki_base * load_base::loadItem(QString)
 {
 	return NULL;
 }
diff --git a/lib/pki_base.h b/lib/pki_base.h
index ae42a902..4ed2f99a 100644
--- a/lib/pki_base.h
+++ b/lib/pki_base.h
@@ -37,20 +37,19 @@ class pki_base : public QObject
 	public:
 		QList<pki_base*> childItems;
 		pki_base(const QString d = "", pki_base *p = NULL);
-		virtual void fload(const QString name){};
-		virtual void writeDefault(const QString fname){};
+		//virtual void fload(const QString name);
+		virtual void writeDefault(const QString){};
 		static int get_pki_counter(void);
-		virtual void fromData(const unsigned char *p, db_header_t *head){};
+		virtual void fromData(const unsigned char *, db_header_t *){};
 		virtual void oldFromData(unsigned char *p, int size);
-		virtual unsigned char *toData(int *size){return NULL;}
-		virtual bool compare(pki_base *ref){return false;}
+		virtual unsigned char *toData(int *) { return NULL; }
+		virtual bool compare(pki_base *) { return false; };
 		virtual ~pki_base();
 			QString getIntName() const;
 		QString getUnderlinedName() const;
 			void setIntName(const QString &d);
 		QString getClassName();
 		static QString rmslashdot(const QString &fname);
-		//virtual void updateView();
 
 		int getVersion();
 		enum pki_type getType();
diff --git a/lib/pki_key.cpp b/lib/pki_key.cpp
index e3e5caa5..bf6af3ba 100644
--- a/lib/pki_key.cpp
+++ b/lib/pki_key.cpp
@@ -61,7 +61,7 @@ void pki_key::init(int type)
 	cols=5;
 }
 
-void pki_key::incProgress(int a, int b, void *progress)
+void pki_key::incProgress(int, int, void *progress)
 {
 	int i = ((QProgressBar *)progress)->value();
 			((QProgressBar *)progress)->setValue(++i);
@@ -517,7 +517,7 @@ void pki_key::writePKCS8(const QString fname, const EVP_CIPHER *enc,
 	fclose(fp);
 }
 
-static int mycb(char *buf, int size, int rwflag, void *userdata)
+static int mycb(char *buf, int size, int, void *)
 {
 	strncpy(buf, pki_key::passwd, size);
 	return strlen(pki_key::passwd);
diff --git a/lib/pki_temp.cpp b/lib/pki_temp.cpp
index 2c476094..5fcd981e 100644
--- a/lib/pki_temp.cpp
+++ b/lib/pki_temp.cpp
@@ -94,7 +94,7 @@ void pki_temp::fromData(const unsigned char *p, db_header_t *head )
 	fromData(p, size, version);
 }
 
-void pki_temp::fromData(const unsigned char *p, int size, int version)
+void pki_temp::fromData(const unsigned char *p, int size, int)
 {
 	const unsigned char *p1 = p;
 
@@ -251,8 +251,8 @@ pki_temp::~pki_temp()
 int pki_temp::dataSize()
 {
 	int s = 9 * sizeof(int) +
-	       8 * sizeof(char) +
-	       xname.derSize() + (
+			8 * sizeof(char) +
+		xname.derSize() + (
 	subAltName.length() +
 	issAltName.length() +
 	crlDist.length() +
@@ -270,10 +270,10 @@ int pki_temp::dataSize()
 }
 
 
-bool pki_temp::compare(pki_base *ref)
+bool pki_temp::compare(pki_base *)
 {
- // we don't care if templates with identical contents
- // are stored in the database ...
+	// we don't care if templates with identical contents
+	// are stored in the database ...
 	return false;
 }
 
diff --git a/widgets/MW_database.cpp b/widgets/MW_database.cpp
index 29c4223c..ab835ea7 100644
--- a/widgets/MW_database.cpp
+++ b/widgets/MW_database.cpp
@@ -120,7 +120,6 @@ void MainWindow::undelete()
 	ImportMulti *dlgi = new ImportMulti(this);
 	db_header_t head;
 	db mydb(dbfile);
-	int items = 0;
 
 	for (mydb.first(DBFLAG_OUTDATED); !mydb.eof(); mydb.next(DBFLAG_OUTDATED)) {
 		mydb.get_header(&head);
diff --git a/widgets/MainWindow.cpp b/widgets/MainWindow.cpp
index 1d52a3c8..13f936e1 100644
--- a/widgets/MainWindow.cpp
+++ b/widgets/MainWindow.cpp
@@ -274,7 +274,7 @@ int MainWindow::initPass()
 
 // Static Password Callback functions
 
-int MainWindow::passRead(char *buf, int size, int rwflag, void *userdata)
+int MainWindow::passRead(char *buf, int size, int, void *userdata)
 {
 	int ret = -1;
 	pass_info *p = (pass_info *)userdata;
@@ -297,7 +297,7 @@ int MainWindow::passRead(char *buf, int size, int rwflag, void *userdata)
 }
 
 
-int MainWindow::passWrite(char *buf, int size, int rwflag, void *userdata)
+int MainWindow::passWrite(char *buf, int size, int, void *userdata)
 {
 	int ret = -1;
 	pass_info *p = (pass_info *)userdata;
@@ -365,5 +365,5 @@ void MainWindow::connNewX509(NewX509 *nx)
  * segfaults. Thus I include the file here and remove it from the Makefile
  * and the linker works.
  * There is a FIXME and a warning */
-#warning inclde "MW_menu.cpp"
+#warning include "MW_menu.cpp"
 #include "MW_menu.cpp"
diff --git a/widgets/Makefile b/widgets/Makefile
index 5277c04e..028988c4 100644
--- a/widgets/Makefile
+++ b/widgets/Makefile
@@ -7,7 +7,7 @@ MOC_NAMES=MainWindow KeyDetail clicklabel XcaTreeView ExportKey NewX509 \
 	validity v3ext ReqDetail distname CertDetail CertExtend ExportCert \
 	ImportMulti CrlDetail ExportDer
 
-#NAMES=$(MOC_NAMES) NewX509_ext MW_menu MW_help MW_database
+NAMES=$(MOC_NAMES) NewX509_ext MW_menu MW_help MW_database
 NAMES=$(MOC_NAMES) NewX509_ext MW_help MW_database
 OBJS=$(patsubst %,moc_%.o,$(MOC_NAMES)) $(patsubst %,%.o,$(NAMES))
 DELFILES=$(patsubst %,moc_%.cpp,$(MOC_NAMES))
diff --git a/widgets/NewX509.cpp b/widgets/NewX509.cpp
index d33c99d2..4257fc8d 100644
--- a/widgets/NewX509.cpp
+++ b/widgets/NewX509.cpp
@@ -379,12 +379,12 @@ void NewX509::toggleOkBut()
 	okButton->setEnabled(ok);
 }
 
-void NewX509::on_description_textChanged(QString text)
+void NewX509::on_description_textChanged(QString)
 {
 	toggleOkBut();
 }
 
-void NewX509::on_countryName_textChanged(QString text)
+void NewX509::on_countryName_textChanged(QString)
 {
 	toggleOkBut();
 }
@@ -400,7 +400,7 @@ void NewX509::on_genKeyBUT_clicked()
 	emit genKey();
 }
 
-void NewX509::on_certList_currentIndexChanged(int index)
+void NewX509::on_certList_currentIndexChanged(int)
 {
 	a1time snb, sna;
 	pki_x509 *cert = getSelectedSigner();