diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
new file mode 100644
index 00000000000..47687ec76d7
--- /dev/null
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl }:
+
+let
+
+  version = "0.8.1";
+  
+in
+
+stdenv.mkDerivation {
+  name = "thinkfan-${version}";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/thinkfan/thinkfan-${version}.tar.gz";
+    sha256 = "04akla66r8k10x0jvmcpfi92hj2sppygcl7hhwn8n8zsvvf0yqxs";
+  };
+  
+  installPhase = ''
+    mkdir -p $out/bin
+    mv thinkfan $out/bin/
+  '';
+
+  meta = {
+    description = "";
+    license = stdenv.lib.licences.gpl3;
+    homePage = "http://thinkfan.sourceforge.net/";
+    maintainers = with stdenv.lib.maintainers; [ iElectric ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a6d5b9ab9b..6ee3afa9756 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9100,6 +9100,8 @@ let
     inherit texLive unzip;
   };
 
+  thinkfan = callPackage ../tools/system/thinkfan { };
+
   vice = callPackage ../misc/emulators/vice { };
 
   viewnior = callPackage ../applications/graphics/viewnior { };