diff --git a/Makefile b/Makefile
index a5e20aee8..8a9804403 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SRCS=checkbufferoverrun.cpp	checkclass.cpp	checkheaders.cpp	checkmemoryleak.cpp	checkfunctionusage.cpp	checkother.cpp	filelister.cpp	preprocessor.cpp	tokenize.cpp	cppcheck.cpp	settings.cpp token.cpp cppcheckexecutor.cpp
+SRCS=checkbufferoverrun.cpp	checkclass.cpp	checkheaders.cpp	checkmemoryleak.cpp	checkfunctionusage.cpp	checkother.cpp	filelister.cpp	preprocessor.cpp	tokenize.cpp	cppcheck.cpp	settings.cpp token.cpp cppcheckexecutor.cpp	errormessage.cpp
 OBJS=$(SRCS:%.cpp=%.o)
 TESTS=testbufferoverrun.o	testcharvar.o	testclass.o	testconstructors.o	testdivision.o  testfunctionusage.o	testincompletestatement.o	testother.o	testmemleak.o	testmemleakmp.o	testpreprocessor.o	testredundantif.o	testsimplifytokens.o	testtokenize.o	testtoken.o	testunusedprivfunc.o	testunusedvar.o	testfilelister.o
 BIN = ${DESTDIR}/usr/bin
@@ -32,6 +32,8 @@ preprocessor.o: preprocessor.cpp preprocessor.h errorlogger.h
 	g++ $(CFLAGS) -c $*.cpp
 settings.o: settings.cpp settings.h
 	g++ $(CFLAGS) -c $*.cpp
+errormessage.o: errormessage.cpp errormessage.h
+	g++ $(CFLAGS) -c $*.cpp
 testbufferoverrun.o: testbufferoverrun.cpp tokenize.h settings.h errorlogger.h token.h checkbufferoverrun.h testsuite.h
 	g++ $(CFLAGS) -c $*.cpp
 testcharvar.o: testcharvar.cpp tokenize.h settings.h errorlogger.h token.h checkother.h testsuite.h
diff --git a/cppcheck.cbp b/cppcheck.cbp
index f99748a6b..5cd50b5df 100644
--- a/cppcheck.cbp
+++ b/cppcheck.cbp
@@ -47,6 +47,8 @@
 		<Unit filename="cppcheckexecutor.cpp" />
 		<Unit filename="cppcheckexecutor.h" />
 		<Unit filename="errorlogger.h" />
+		<Unit filename="errormessage.cpp" />
+		<Unit filename="errormessage.h" />
 		<Unit filename="filelister.cpp" />
 		<Unit filename="filelister.h" />
 		<Unit filename="main.cpp" />
diff --git a/errormessage.cpp b/errormessage.cpp
new file mode 100644
index 000000000..ef8188c97
--- /dev/null
+++ b/errormessage.cpp
@@ -0,0 +1,11 @@
+#include "errormessage.h"
+
+ErrorMessage::ErrorMessage()
+{
+    //ctor
+}
+
+ErrorMessage::~ErrorMessage()
+{
+    //dtor
+}
diff --git a/errormessage.h b/errormessage.h
new file mode 100644
index 000000000..4bf85d71d
--- /dev/null
+++ b/errormessage.h
@@ -0,0 +1,19 @@
+#ifndef ErrorMessageH
+#define ErrorMessageH
+
+/**
+ * This class is used by the Cppcheck application to get
+ * informative error messages when e.g. memory leak is found
+ * from the inspected source file. This is also used another
+ * program to generate text for wiki and man page.
+ */
+class ErrorMessage
+{
+    public:
+        ErrorMessage();
+        virtual ~ErrorMessage();
+    protected:
+    private:
+};
+
+#endif // ErrorMessageH