diff --git a/html/inc/akismet.inc b/html/inc/akismet.inc
new file mode 100644
index 0000000000..4901cdb200
--- /dev/null
+++ b/html/inc/akismet.inc
@@ -0,0 +1,59 @@
+<?php
+
+function akismet_check($user, $post) {
+    $config = get_config();
+    $master_url = parse_config($config, "<master_url>");
+    $key = parse_config(get_config(), "<akismet_key>");
+    if ($key == null) {
+        exit();
+        return true; // unable to get key from config
+    }
+    $master_url = urlencode($master_url);
+    $response = akismet_request("key=$key&blog=$master_url", "rest.akismet.com", "/1.1/verify-key");
+    if ("valid" == $response[1] ) {
+        $post = urlencode($post);
+        $ip = urlencode($_SERVER['REMOTE_ADDR']);
+        $referrer = urlencode($_SERVER['HTTP_REFERER']);
+        $author = urlencode($user->getName());
+        $useragent = urlencode($_SERVER['HTTP_USER_AGENT']);
+
+        $request  = "blog=$master_url";
+        $request .= "&user_ip=$ip";
+        $request .= "&user_agent=$useragent";
+        $request .= "&referrer=$referrer";
+        $request .= "&comment_author=$author";
+        $request .= "&comment_content=$post";
+
+        $response = akismet_request($request, "$key.rest.akismet.com", "/1.1/comment-check");
+
+        if ("true" == $response[1]) { // Akismet says it's spam
+            error_page("Your post has been marked as spam by akismet.net anti-spam system. If you feel that this is wrong, please try editing your message.");
+        } else {
+            return true;
+        }
+    } else {
+        return true; // invalid key
+    }
+}
+
+function akismet_request($request, $host, $path, $port = 80) {
+    $http_request  = "POST $path HTTP/1.0\r\n";
+    $http_request .= "Host: $host\r\n";
+    $http_request .= "Content-Type: application/x-www-form-urlencoded; charset=utf-8\r\n";
+    $http_request .= "Content-Length: " . strlen($request) . "\r\n";
+    $http_request .= "User-Agent: BOINC | Akismet 1.1\r\n";
+    $http_request .= "\r\n";
+    $http_request .= $request;
+
+    $response = '';
+    if( false !== ( $fs = @fsockopen($host, $port, $errno, $errstr, 3) ) ) {
+        fwrite($fs, $http_request);
+        while ( !feof($fs) )
+            $response .= fgets($fs, 1160); // One TCP-IP packet
+        fclose($fs);
+        $response = explode("\r\n\r\n", $response, 2);
+    }
+    return $response;
+}  
+
+?>
\ No newline at end of file
diff --git a/html/user/forum_post.php b/html/user/forum_post.php
index 7f44f5557f..4a82d9b875 100644
--- a/html/user/forum_post.php
+++ b/html/user/forum_post.php
@@ -8,6 +8,7 @@ $cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
 require_once('../inc/forum_email.inc');
 require_once('../inc/forum.inc');
 require_once('../inc/forum_std.inc');
+require_once('../inc/akismet.inc');
 
 db_init();
 
@@ -50,6 +51,7 @@ if ($content && $title){
         $add_signature=false;
     }
     check_tokens($logged_in_user->getAuthenticator());
+    akismet_check($logged_in_user, $content);
     $thread = $forum->createThread($title, $content, $logged_in_user, $add_signature);
     header('Location: forum_thread.php?id=' . $thread->getID());
 }
diff --git a/html/user/forum_reply.php b/html/user/forum_reply.php
index 10e7d267b1..fa99114422 100644
--- a/html/user/forum_reply.php
+++ b/html/user/forum_reply.php
@@ -3,10 +3,10 @@
  * Using this file you can post a reply to a thread.  Both input (form) and
  * action take place here.
  **/
-
 require_once('../inc/forum_email.inc');
 require_once('../inc/forum.inc');
 require_once('../inc/forum_std.inc');
+require_once('../inc/akismet.inc');
 
 db_init();
 
@@ -71,6 +71,7 @@ if ($content){
         $add_signature=false;
     }
     check_tokens($logged_in_user->getAuthenticator());
+    akismet_check($logged_in_user, $content);
     $thread->createReply($content, $parent_post, $logged_in_user, $add_signature);
     header('Location: forum_thread.php?id='.$thread->getID());
 }