diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix
index 558420043645..36b6b770bdad 100644
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/pkgs/misc/frescobaldi/default.nix
@@ -5,7 +5,8 @@ pythonPackages.buildPythonPackage rec {
   version = "2.0.16";
 
   src = fetchurl {
-    url = "https://github.com/wbsoft/frescobaldi/releases/download/v2.0.16/${name}.tar.gz";
+    url = "https://github.com/wbsoft/frescobaldi/releases/download/"
+          + "v2.0.16/${name}.tar.gz";
     sha256 = "12pabvq5b2lq84q3kx8lh02zh6ali6v4wnin2k2ycnm45mk9ms6q";
   };
 
@@ -14,21 +15,23 @@ pythonPackages.buildPythonPackage rec {
 
   patches = [ ./setup.cfg.patch ./python-path.patch ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://frescobaldi.org/;
     description = ''Frescobaldi is a LilyPond sheet music text editor'';
     longDescription = ''
-    Powerful text editor with syntax highlighting and automatic completion, 
-    Music view with advanced Point & Click, Midi player to proof-listen
-    LilyPond-generated MIDI files, Midi capturing to enter music,
-    Powerful Score Wizard to quickly setup a music score, Snippet Manager
-    to store and apply text snippets, templates or scripts, Use multiple
-    versions of LilyPond, automatically selects the correct version, Built-in
-    LilyPond documentation browser and built-in User Guide, Smart
-    layout-control functions like coloring specific objects in the PDF,
-    MusicXML import, Modern user iterface with configurable colors,
-    fonts and keyboard shortcuts
+      Powerful text editor with syntax highlighting and automatic completion, 
+      Music view with advanced Point & Click, Midi player to proof-listen
+      LilyPond-generated MIDI files, Midi capturing to enter music,
+      Powerful Score Wizard to quickly setup a music score, Snippet Manager
+      to store and apply text snippets, templates or scripts, Use multiple
+      versions of LilyPond, automatically selects the correct version, Built-in
+      LilyPond documentation browser and built-in User Guide, Smart
+      layout-control functions like coloring specific objects in the PDF,
+      MusicXML import, Modern user iterface with configurable colors,
+      fonts and keyboard shortcuts
     '';
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.sepi ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c7cd3af43eb3..9195982ada92 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2604,14 +2604,16 @@ let
     name = "poppler-qt4-${version}";
     version = "0.18.1";
     
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-poppler-qt4/python-poppler-qt4-${version}.tar.gz";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/python-poppler-qt4/" +
+            "python-poppler-qt4-${version}.tar.gz";
       md5 = "9c4c5a59b878aed78e96a6ae58c6c185";
     };
 
-    propagatedBuildInputs = [ pyqt4 sip pkgs.pkgconfig pkgs.popplerQt4 ];
+    propagatedBuildInputs = [ pkgs.pyqt4 pkgs.sip pkgs.pkgconfig pkgs.popplerQt4 ];
 
-    preBuild = "${python}/bin/${python.executable} setup.py build_ext --include-dirs=${pkgs.popplerQt4}/include/poppler/";
+    preBuild = "${python}/bin/${python.executable} setup.py build_ext" +
+               " --include-dirs=${pkgs.popplerQt4}/include/poppler/";
 
     meta = with stdenv.lib; {
       description = "A Python binding to Poppler-Qt4";
@@ -2619,7 +2621,8 @@ let
         A Python binding to Poppler-Qt4 that aims for completeness
         and for being actively maintained.
       '';
-      license = licenses.lgpl;
+      license = licenses.lgpl31Plus;
+      maintainers = [ maintainers.sepi ];
       platforms = platforms.all;
     };
   };