diff --git a/.gitignore b/.gitignore
index 674b0c7d..31191bfa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@ src/*.exe
 src/bitcoin
 src/bitcoind
 src/test_bitcoin
+src/.deps/
+src/.dirstamp
 .*.swp
 *.*~*
 *.bak
@@ -56,3 +58,14 @@ qrc_*.cpp
 build
 
 !src/leveldb-*/Makefile
+
+build-aux/
+libtool
+libtorrent/src/.deps/
+libtorrent/src/.dirstamp
+libtorrent/src/kademlia/.deps/
+libtorrent/src/kademlia/.dirstamp
+
+# Targets
+twister-control
+twisterd
diff --git a/Makefile.am b/Makefile.am
index 74e097c4..5aae1d49 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -201,6 +201,9 @@ clean-local:
 	-$(MAKE) -C src/leveldb clean
 	rm -f src/leveldb/*/*.gcno src/leveldb/helpers/memenv/*.gcno
 
+cppcheck:
+	cppcheck ./src --force --quiet ./src/cppcheck-supressions.txt
+
 pixmapsdir = $(datadir)/pixmaps
 pixmaps_DATA = share/pixmaps/*
 
diff --git a/src/cppcheck-suppressions.txt b/src/cppcheck-suppressions.txt
new file mode 100644
index 00000000..3b3898e0
--- /dev/null
+++ b/src/cppcheck-suppressions.txt
@@ -0,0 +1,2 @@
+uninitstring:src/scrypt.cpp:83
+arrayIndexOutOfBounds:src/test/DoS_tests.cpp:300