diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix
new file mode 100644
index 00000000000..da2ac49b195
--- /dev/null
+++ b/pkgs/tools/system/uptimed/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, automake, autoconf, libtool}:
+
+stdenv.mkDerivation {
+  name = "uptimed-0.3.16";
+  
+  src = fetchurl {
+    url = http://podgorny.cz/uptimed/releases/uptimed-0.3.16.tar.bz2;
+    sha256 = "0axi2rz4gnmzzjl7xay7y8j1mh6iqqyg0arl1jyc3fgsk1ggy27m";
+  };
+
+  patches = [ ./no-var-spool-install.patch ];
+
+  buildInputs = [automake autoconf libtool];
+
+  meta = {
+    homepage = http://podgorny.cz/uptimed/;
+  };
+}
diff --git a/pkgs/tools/system/uptimed/no-var-spool-install.patch b/pkgs/tools/system/uptimed/no-var-spool-install.patch
new file mode 100644
index 00000000000..f591aad4b50
--- /dev/null
+++ b/pkgs/tools/system/uptimed/no-var-spool-install.patch
@@ -0,0 +1,15 @@
+diff -rc uptimed-0.3.16/Makefile.am uptimed-0.3.16-new/Makefile.am
+*** uptimed-0.3.16/Makefile.am	2009-01-02 00:46:00.000000000 +0100
+--- uptimed-0.3.16-new/Makefile.am	2009-09-16 09:24:29.952524967 +0200
+***************
+*** 8,16 ****
+  
+  AM_CFLAGS = @CFLAGS@ -DFILE_CONFIG=\"$(sysconfdir)/uptimed.conf\"
+  
+- install-data-local:
+- 	$(INSTALL) -d $(DESTDIR)/var/spool/uptimed
+- 
+  srpm: dist
+  	@(rpmbuild -ts uptimed-$(PACKAGE_VERSION).tar.gz)
+  
+--- 8,13 ----
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0be171786a6..ff148d4e342 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1541,6 +1541,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  uptimed = import ../tools/system/uptimed {
+    inherit fetchurl stdenv automake autoconf libtool;
+  };
+
   wdfs = import ../tools/networking/wdfs {
     inherit stdenv fetchurl neon fuse pkgconfig;
     inherit (gtkLibs) glib;