diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c582a037118d..8191882130af 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -86,13 +86,27 @@ rec {
       url = "http://www.aarontrevena.co.uk/opensource/autodia/download/${name}.tar.gz";
       sha256 = "1pzp30lnqkip2yrmnyzrf62g08xwn751nf9gmwdxjc09daaihwaz";
     };
-    propagatedBuildInputs = [ TemplateToolkit ];
-
-    # FIXME: `autodia_java.pl' needs `Inline' and `Inline::Java'.
+    propagatedBuildInputs = [ TemplateToolkit Inline InlineJava ];
 
     meta = {
       description = "AutoDia, create UML diagrams from source code";
+
+      longDescription = ''
+        AutoDia is a modular application that parses source code, XML or data
+        and produces an XML document in Dia format (or images via graphviz
+        and vcg).  Its goal is to be a UML / DB Schema diagram autocreation
+        package.  The diagrams its creates are standard UML diagrams showing
+        dependancies, superclasses, packages, classes and inheritances, as
+        well as the methods, etc of each class.
+
+        AutoDia supports any language that a Handler has been written for,
+        which includes C, C++, Java, Perl, Python, and more.
+      '';
+
       homepage = http://www.aarontrevena.co.uk/opensource/autodia/;
+      license = "GPLv2+";
+
+      maintainers = [ stdenv.lib.maintainers.ludo ];
     };
   };
 
@@ -1308,6 +1322,64 @@ rec {
       };
     };
 
+  Inline = buildPerlPackage rec {
+    name = "Inline-0.45";
+
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SI/SISYPHUS/${name}.tar.gz";
+      sha256 = "1k5nrb3nh2y33bs944ri78m1ni60v4cl67ffhxx88azj542y5c9x";
+    };
+
+    propagatedBuildInputs = [ ParseRecDescent ];
+
+    meta = {
+      description = "Inline -- Write Perl subroutines in other programming languages";
+
+      longDescription = ''
+        The Inline module allows you to put source code from other
+        programming languages directly "inline" in a Perl script or
+        module. The code is automatically compiled as needed, and then loaded
+        for immediate access from Perl.
+      '';
+
+      license = "Artistic";
+
+      maintainers = [ stdenv.lib.maintainers.ludo ];
+    };
+  };
+
+  InlineJava = buildPerlPackage rec {
+    name = "Inline-Java-0.52";
+
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PA/PATL/${name}.tar.gz";
+      sha256 = "0xdx1nnjvsih2njcncmwxwdi3w2zf74vqb9wpn1va8ii93mlakff";
+    };
+
+    propagatedBuildInputs = [ Inline ];
+
+    makeMakerFlags = "J2SDK=${pkgs.jdk}";
+
+    # FIXME: Apparently tests want to access the network.
+    doCheck = false;
+
+    meta = {
+      description = "Inline::Java -- Write Perl classes in Java";
+
+      longDescription = ''
+        The Inline::Java module allows you to put Java source code directly
+        "inline" in a Perl script or module.  A Java compiler is launched and
+        the Java code is compiled.  Then Perl asks the Java classes what
+        public methods have been defined.  These classes and methods are
+        available to the Perl program as if they had been written in Perl.
+      '';
+
+      license = "Artistic";
+
+      maintainers = [ stdenv.lib.maintainers.ludo ];
+    };
+  };
+
   JSON = buildPerlPackage rec {
     name = "JSON-2.15";
     src = fetchurl {