diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix
new file mode 100644
index 00000000000..83707b2477e
--- /dev/null
+++ b/pkgs/development/libraries/libinfinity/default.nix
@@ -0,0 +1,43 @@
+{ gtkWidgets ? false # build GTK widgets for libinfinity
+, daemon ? false # build infinote daemon
+, documentation ? false # build documentation
+, avahiSupport ? false # build support for Avahi in libinfinity
+, stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl
+, gtk ? null, gtkdoc ? null, avahi ? null, libdaemon ? null }:
+
+let
+  edf = flag: feature: (if flag then "--with-" else "--without-") + feature;
+  optional = cond: elem: assert cond -> elem != null; if cond then [elem] else [];
+
+in stdenv.mkDerivation rec {
+
+  name = "libinfinity-0.4.1";
+  src = fetchurl {
+    url = "http://releases.0x539.de/libinfinity/${name}.tar.gz";
+    sha256 = "1vdyj6xvwkisrc222i84mq93gasywad4i0ismafdjq2wapxn30r6";
+  };
+
+  buildInputs = [ pkgconfig glib libxml2 gnutls gsasl ]
+    ++ optional gtkWidgets gtk
+    ++ optional documentation gtkdoc
+    ++ optional avahiSupport avahi
+    ++ optional daemon libdaemon;
+  
+  configureFlags = ''
+    ${if documentation then "--enable-gtk-doc" else "--disable-gtk-doc"}
+    ${edf gtkWidgets "inftextgtk"}
+    ${edf gtkWidgets "infgtk"}
+    ${edf daemon "infinoted"}
+    ${edf daemon "libdaemon"}
+    ${edf avahiSupport "avahi"}
+  '';
+
+  meta = {
+    homepage = http://gobby.0x539.de/;
+    description = "An implementation of the Infinote protocol written in GObject-based C";
+    license = "LGPLv2+";
+    maintainers = [ stdenv.lib.maintainers.phreedom ];
+  };
+
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87c7aae3535..bc302678e90 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4583,6 +4583,13 @@ let
     inherit fetchurl stdenv pkgconfig libraw1394;
   };
 
+  libinfinity = makeOverridable (import ../development/libraries/libinfinity) {
+    inherit stdenv fetchurl pkgconfig;
+    inherit (gtkLibs) gtk glib;
+    inherit (gnome) gtkdoc;
+    inherit libxml2 gnutls gsasl avahi libdaemon;
+  };
+  
   libiptcdata = import ../development/libraries/libiptcdata {
     inherit fetchurl stdenv;
   };