diff --git a/democlient/build.sh b/democlient/build.sh
new file mode 100755
index 000000000..dd37bdc18
--- /dev/null
+++ b/democlient/build.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+g++ -O2 -o democlient.cgi -Icppcheck-1.55/lib democlient.cpp cppcheck-1.55/lib/*.cpp
+mv democlient.cgi /home/project-web/cppcheck/cgi-bin/
+chmod +rx /home/project-web/cppcheck/cgi-bin/democlient.cgi
diff --git a/democlient/democlient.cpp b/democlient/democlient.cpp
new file mode 100644
index 000000000..cc15e61fe
--- /dev/null
+++ b/democlient/democlient.cpp
@@ -0,0 +1,92 @@
+
+#include <stdio.h>
+#include <cstdlib>
+#include <algorithm>
+
+#include "cppcheck.h"
+
+static void unencode(const char *src, char *dest)
+{
+    for(; *src; src++, dest++) {
+         if(*src == '+')
+             *dest = ' ';
+         else if(*src == '%') {
+             int code;
+             if (sscanf(src+1, "%2x", &code) != 1)
+                 code = '?';
+             *dest = code;
+             src += 2;
+         }
+         else
+             *dest = *src;
+    }
+    *dest = '\0';
+}
+
+
+class CppcheckExecutor : public ErrorLogger
+{
+private:
+    const std::time_t stoptime;
+    CppCheck cppcheck;
+
+public:
+    CppcheckExecutor()
+    : ErrorLogger()
+    , stoptime(std::time(NULL)+2U)
+    , cppcheck(*this,false)
+    {
+        cppcheck.settings().addEnabled("all");
+        cppcheck.settings().inconclusive = true;
+    }
+
+    void run(const char code[])
+    {
+        printf("%s\n", ErrorLogger::ErrorMessage::getXMLHeader(2).c_str());
+        cppcheck.check("test.c", code);
+        printf("%s\n", ErrorLogger::ErrorMessage::getXMLFooter(2).c_str());
+        printf("\n\n");
+    }
+
+    void reportOut(const std::string &outmsg) { }
+    void reportErr(const ErrorLogger::ErrorMessage &msg)
+    {
+        const std::string str(msg.toXML(true,2U));
+        printf("%s\n", str.c_str());
+    }
+
+    void reportProgress(const 
+                std::string &filename, 
+                const char stage[],
+                const unsigned int value)
+    {
+        if (std::time(NULL) >= stoptime) 
+        {
+            printf("time to analyse the "
+                   "code is more than 1 "
+                   "second. terminating."
+                   "\n\n");
+            cppcheck.terminate();
+        }
+    }
+};
+
+
+int main()
+{
+    const char *lenstr = getenv("CONTENT_LENGTH");
+    char data[4096] = {0};
+    int len = std::min(1 + atoi(lenstr), (int)(sizeof(data) - 2));
+    fgets(data, len, stdin);
+
+    char code[4096] = {0};
+    unencode(data, code);
+
+    printf("Content-type: text/plain\n\n");
+
+    CppcheckExecutor cppcheckExecutor;
+    cppcheckExecutor.run(code);
+
+    return EXIT_SUCCESS;
+}
+
diff --git a/democlient/info.txt b/democlient/info.txt
new file mode 100644
index 000000000..21421ccf4
--- /dev/null
+++ b/democlient/info.txt
@@ -0,0 +1,11 @@
+Get cppcheck:
+
+wget https://downloads.sourceforge.net/project/cppcheck/cppcheck/1.54/cppcheck-1.54.tar.bz2
+
+Unpack:
+
+tar xjvf cppcheck-1.54.tar.bz2
+
+Compile:
+
+./build.sh