diff --git a/srcpkgs/cppcheck/patches/Makefile_fix.diff b/srcpkgs/cppcheck/patches/Makefile_fix.diff
new file mode 100644
index 00000000000..a297ad4ef73
--- /dev/null
+++ b/srcpkgs/cppcheck/patches/Makefile_fix.diff
@@ -0,0 +1,36 @@
+--- Makefile.orig	2010-01-18 16:06:14.309966144 +0100
++++ Makefile	2010-01-18 16:13:22.777964886 +0100
+@@ -1,12 +1,12 @@
+-CXXFLAGS=-Wall -Wextra -pedantic -g
++CXXFLAGS=-Wall -Wextra -pedantic
+ CXX=g++
+ BIN=${DESTDIR}/usr/bin
+ 
+ # For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml
+-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
++DB2MAN=/usr/share/xsl/docbook/manpages/docbook.xsl
+ XP=xsltproc -''-nonet -''-param man.charmap.use.subset "0"
+ MAN_SOURCE=man/cppcheck.1.xml
+-
++MANDIR=$(DESTDIR)/usr/share/man
+ 
+ ###### Object Files
+ 
+@@ -82,12 +82,14 @@ tools/dmake:	tools/dmake.cpp	lib/filelis
+ clean:
+ 	rm -f lib/*.o cli/*.o test/*.o testrunner cppcheck tools/dmake
+ 
+-man:	$(MAN_SOURCE)
+-	$(XP) $(DB2MAN) $(MAN_SOURCE)
++cppcheck.1:	$(MAN_SOURCE)
++	$(XP) $(DB2MAN) $<
+ 
+ install:	cppcheck
+ 	install -d ${BIN}
+-	install cppcheck ${BIN}
++	install -m755 cppcheck ${BIN}
++	install -d $(MANDIR)/man1
++	install -m644 cppcheck.1 $(MANDIR)/man1
+ 
+ 
+ ###### Build
diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
new file mode 100644
index 00000000000..ee56191195c
--- /dev/null
+++ b/srcpkgs/cppcheck/template
@@ -0,0 +1,23 @@
+# Template file for 'cppcheck'
+pkgname=cppcheck
+version=1.40
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
+build_style=gnu_makefile
+make_build_target="cppcheck cppcheck.1"
+short_desc="Static analysis of C/C++ code"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=77dc5dd758abc7497367f5f20a6af8e9ae3e460ac99c7813fec4e8aef089d439
+long_desc="
+ Cppcheck is a tool for static C/C++ code analysis, and it tries to
+ detect bugs that your compiler do not see. Checks for: memory leaks,
+ mismatching allocation-deallocation, buffer overrun, and many more.
+
+ Cppcheck is versatile. You can check non-standard code that includes
+ various compiler extensions, inline assembly code, etc. The goal is no
+ false positives."
+ 
+Add_dependency run glibc
+Add_dependency run libgcc
+Add_dependency run libstdc++
+Add_dependency build libxslt
+Add_dependency build docbook-xsl