diff --git a/gnu-system.am b/gnu-system.am
index 6e50b6da22..a9c86bbf01 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -170,6 +170,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/scheme.scm			\
   gnu/packages/screen.scm			\
   gnu/packages/sdl.scm				\
+  gnu/packages/serveez.scm			\
   gnu/packages/shishi.scm			\
   gnu/packages/skribilo.scm			\
   gnu/packages/slim.scm				\
diff --git a/gnu/packages/serveez.scm b/gnu/packages/serveez.scm
new file mode 100644
index 0000000000..2423e35c97
--- /dev/null
+++ b/gnu/packages/serveez.scm
@@ -0,0 +1,60 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Eric Bavier <bavier@member.fsf.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages serveez)
+  #:use-module (guix packages)
+  #:use-module (guix licenses)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages guile))
+
+(define-public serveez
+  (package
+    (name "serveez")
+    (version "0.2.2")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/serveez/serveez-"
+                          version ".tar.xz"))
+      (sha256
+       (base32
+        "09a5jh762ps71ivlg7vdlzp3y29ncl3nsad7qbcni78bq2mzwxsc"))))
+    (build-system gnu-build-system)
+    (inputs `(("guile" ,guile-2.0)))
+    (arguments
+     `(#:configure-flags '("--enable-libserveez-install")
+       #:phases (alist-cons-before
+                 'patch-source-shebangs 'patch-test-source
+                 (lambda _
+                   (substitute*
+                       (find-files "test" "^t[0-9]{3}$")
+                     (("/bin/sh") (which "sh"))))
+                 %standard-phases)))
+    (home-page "http://www.gnu.org/software/serveez/")
+    (synopsis "Framework for implementing IP-based servers")
+    (description
+     "GNU Serveez is a server framework providing the routines necessary to
+easily implement IP-based servers in your application.  It
+demonstrates aspects of network programming in a portable manner,
+making it convenient for both simplifying the process of adding a
+server to your application or for learning about how network services
+work.  Several example servers are provided already, such as an HTTP
+server and an IRC server.")
+    (license gpl3+)))