diff --git a/gnu/local.mk b/gnu/local.mk
index aaa9f5cc47..3fbd0e16d8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -360,6 +360,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/tmux.scm				\
   %D%/packages/tor.scm				\
   %D%/packages/tv.scm				\
+  %D%/packages/uml.scm				\
   %D%/packages/unrtf.scm			\
   %D%/packages/upnp.scm				\
   %D%/packages/uucp.scm				\
diff --git a/gnu/packages/uml.scm b/gnu/packages/uml.scm
new file mode 100644
index 0000000000..8f6e1d8a5e
--- /dev/null
+++ b/gnu/packages/uml.scm
@@ -0,0 +1,91 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Theodoros Foradis <theodoros.for@openmailbox.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 uml)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix utils)
+  #:use-module (guix build-system ant)
+  #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages java))
+
+(define-public plantuml
+  (package
+    (name "plantuml")
+    (version "8048")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://sourceforge/plantuml/plantuml-"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "1vipxd6p7isb1k1qqh4hrpfcj27hx1nll2yp0rfwpvps1w2d936i"))))
+    (build-system ant-build-system)
+    (arguments
+     `(#:tests? #f ; no tests
+       #:build-target "dist"
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'delete-extra-from-classpath
+           (lambda _
+             (substitute* "build.xml"
+               (("1.6") "1.7")
+               (("<attribute name=\"Class-Path\"") "<!--")
+               (("j2v8_macosx_x86_64-3.1.7.jar\" />") "-->"))
+             #t))
+         (add-after 'delete-extra-from-classpath 'patch-usr-bin-dot
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((dot (string-append (assoc-ref inputs "graphviz")
+                                       "/bin/dot")))
+               (substitute*
+                   "src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizLinux.java"
+                 (("/usr/bin/dot") dot)))
+             #t))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (install-file "plantuml.jar" (string-append
+                                           (assoc-ref outputs "out")
+                                           "/share/java"))
+             #t))
+         (add-after 'install 'make-wrapper
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (wrapper (string-append out "/bin/plantuml")))
+               (mkdir-p (string-append out "/bin"))
+               (with-output-to-file wrapper
+                 (lambda _
+                   (display
+                    (string-append
+                     "#!/bin/sh\n\n"
+                     (assoc-ref inputs "jre") "/bin/java -jar "
+                     out "/share/java/plantuml.jar \"$@\"\n"))))
+               (chmod wrapper #o555))
+             #t)))))
+    (inputs
+     `(("graphviz" ,graphviz)
+       ("jre" ,icedtea)))
+    (home-page "http://plantuml.com/")
+    (synopsis "Draw UML diagrams from simple textual description")
+    (description
+     "Plantuml is a tool to generate sequence, usecase, class, activity,
+component, state, deployment and object UML diagrams, using a simple and
+human readable text description.  Contains @code{salt}, a tool that can design
+simple graphical interfaces.")
+    (license license:gpl3+)))