diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index a0c59c4e044f..5b677dd13d44 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -1,7 +1,7 @@
 { callPackage, callPackageOrig, stdenv, qt47 }:
 
 let
-  release = "4.7.0";
+  release = "4.7.1";
 
   # Need callPackageOrig to avoid infinite cycle
   kde = callPackageOrig ./kde-package {
@@ -47,7 +47,12 @@ kde.modules // kde.individual //
 
   qt4 = qt47;
 
-  kdebase_workspace = kde.individual.kde_workspace;
+  kdebase_workspace = kde.modules.kde_workspace;
+
+  kde_baseapps = kde.modules.kde_baseapps // {
+    inherit (kde.individual) kate konsole;
+    propagatedUserEnvPackages = [ kde.individual.kate kde.individual.konsole ];
+  };
 
   inherit release;
 
diff --git a/pkgs/desktops/kde-4.7/kdebase/kate.nix b/pkgs/desktops/kde-4.7/kde-baseapps/kate.nix
similarity index 100%
rename from pkgs/desktops/kde-4.7/kdebase/kate.nix
rename to pkgs/desktops/kde-4.7/kde-baseapps/kate.nix
diff --git a/pkgs/desktops/kde-4.7/kdebase/kde-baseapps.nix b/pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix
similarity index 100%
rename from pkgs/desktops/kde-4.7/kdebase/kde-baseapps.nix
rename to pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix
diff --git a/pkgs/desktops/kde-4.7/kdebase/konsole.nix b/pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix
similarity index 100%
rename from pkgs/desktops/kde-4.7/kdebase/konsole.nix
rename to pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix
diff --git a/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix b/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix
new file mode 100644
index 000000000000..43de59d7a2e1
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix
@@ -0,0 +1,273 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="blinken";value="0946y6g67bqbkdcnqas97izr514190f08qzq5jg12xjv3q5i9xnr";}
+  {name="cantor";value="1yipf6019nr1vacdl1mp6wwffwaq7khyh1rp5wx0f3y70p7q6w8v";}
+  {name="gwenview";value="00vxhpg2481pz7bh0kac1fsl8dawjlxm7x38y572802qbhd02jr4";}
+  {name="kalgebra";value="1rkl8jyiqi9ymwl4inflgwg2252k5x5yag25zr8crwg1ax9rvmhv";}
+  {name="kalzium";value="110l065vwjfyjr0130xklrsr3jwlqb27fv9mhc9w5v9i5shl79xm";}
+  {name="kamera";value="17sac0bydq4d2rv63jzjy87dry9g3n6chw7gg6nncisvkgz1dyz2";}
+  {name="kanagram";value="10nhgb1gf5vh6767xrbfwicdhw4kd3za4lnwrsww823dqpi6cryz";}
+  {name="kate";value="1n3zs4rs3y4z9g2ssiqi6jy7c2li0pah2p0vsdjw0ifq0xqvvz67";}
+  {name="kbruch";value="0x3y5gbq4xhqjrp4g91v3wjggrimxx6k8nsvny0ykriqql6xzq77";}
+  {name="kcolorchooser";value="1fwjf0fys3iz4c86jfhzq6j43ps7jiab9qhspkv6cvnv1dyi0ryy";}
+  {name="kdeaccessibility";value="1980y2vqxkhz40xkkljqawkafshhrimlyb7hvk5waz9a2jz0vwwj";}
+  {name="kdeadmin";value="1614acnvycihysxy3k26q8xsxswsx73m32n0c34hb0d5xj87ndk0";}
+  {name="kdeartwork";value="0xsmq5x9lbplj3rxza0lxxdbnz5srmxjzw993rzwj9687jvgi6hv";}
+  {name="kde-baseapps";value="1jpfslapsl4l7yqxq4cry0dwj2hps2s6kayj81dcs2crqrz75plc";}
+  {name="kdegames";value="0b3zljmkhyml31kfj9n75sa9h3xknn8v0y099mdc1wcny7p7zyrl";}
+  {name="kdegraphics-strigi-analyzer";value="1xnaipyn29wa5i26rgv2jbijii64qklz5fgcy49zpd0pxqnkxxwl";}
+  {name="kdegraphics-thumbnailers";value="07nvydwzzwnr1a5x3v732mry1qw7lvn8l3h3b73r6fvmnhs91iyp";}
+  {name="kdelibs";value="1gwgilr2m95m8w4q55d79g3qsgpq5jv7aq7crq7xbrhz3smv6ciw";}
+  {name="kdemultimedia";value="1p76vrzr1wmlpnkspy9nf8v1am6bdi5wc6zl4y9lp6y6qv9diz1w";}
+  {name="kdenetwork";value="1hmcljp8d85zyi55314js7jl5ihf060hji5gcm6s4s95xqg7hwvh";}
+  {name="kdepim";value="09lvdpq8nm9b97g0xlmc2ikklq7pc4c61v9lz53mb8c1hi9yxasd";}
+  {name="kdepimlibs";value="0svj7fqkn3g8ryip9qy4rh0j7xnjgwhv45rbz4s6lsjh81ipnc4j";}
+  {name="kdepim-runtime";value="0iy0sph5cvzmyn2gi0had5xhppdxdhs5dqm7lm79lk27i8913sjk";}
+  {name="kdeplasma-addons";value="1xrdqhaklf2l5043l1qhfjqyr6985m5j1jzd8rgabkwa9dv5bb4c";}
+  {name="kde-runtime";value="1qppx56xdrmapl0l0fv2p502yg470hiwhzdjv5kiw0akwl7g2ll5";}
+  {name="kdesdk";value="0db4kiikf0bl07m09cj01id0ivl1hm30pr5401xscqask7ddq2v9";}
+  {name="kdetoys";value="02zjz6h62nlxhjhsv5apxyhs140h6dc5i5laxi68j8fi4p8gyk5a";}
+  {name="kdeutils";value="0s7lw9qiyzn4wccbgalrsb91hspqniaf93x94s3gcw7jmk4znwwd";}
+  {name="kde-wallpapers";value="17x3npychdv9z90a6y2yxxscnczrpzkd8zanml3y1kkx1kcwvkrv";}
+  {name="kdewebdev";value="0ll5s60231vc6k989ahfw7k9wk0r6ml3icg25zj90785ildqqrnz";}
+  {name="kde-workspace";value="15kvc30w4ysjm7il7lkfls3xm9v4azhlz2jv75n5bp5h41kbznl5";}
+  {name="kgamma";value="1fzhhjqz6x19lk6c77mmq94bjk5f8qj0pq9c7923gd9d644azbsc";}
+  {name="kgeography";value="0s9nnsjma95j402wlcswrqdjz9csxbnxpnshcg5xxj3135122yv6";}
+  {name="khangman";value="04frra3qj4jkmhlsr4im6sjhyv7rs32fj88vphzwx0nbq086i078";}
+  {name="kig";value="1si3zi3w75mg9sd2imbs6f2z0ywkzbvg9cj672fmamczw5wrjp6n";}
+  {name="kimono";value="1bqw23g6c1l3bxnnzgz4pn5j2w2vxwfi1nrdjcbkfwsa4px2q7bn";}
+  {name="kiten";value="0i3dp8jqqjlx2hjbqwc01qaja9bh7aas0m4s75py5j2im7gkxncs";}
+  {name="klettres";value="1mxpxh4p16jnxmd2gff4ink222hbd1qxigr3hn8jc3a0kwrnpxdk";}
+  {name="kmplot";value="1adw71m9h6z85lwavsjsbdcnlgkchic6y5110hmb9x067n5hrfkq";}
+  {name="kolourpaint";value="01lc73vvpl5jmzvx9vi857k69mww97rd7fnqm2776d7dbkgpzzs8";}
+  {name="konsole";value="0ywy8xy38v058hfl6yakxqz355y64mmqbhxf0j1h0zz50744ww1r";}
+  {name="korundum";value="1ib02m2dr9ab1v1xxcngdisprr7mlll3h52d9lrjj6clnxlxz1sz";}
+  {name="kross-interpreters";value="1glb2hkj84zmcjjq3sh79w7g4y0v25ddd9hjiilppskwnqby16bb";}
+  {name="kruler";value="18h5kp7pni6j9nqfxzwfcfnv8sbgg1s656clzyi7f9znsw8bgzvd";}
+  {name="ksaneplugin";value="0mk7q66h6v5carkywkpjr5893r01vgcqf0lx9c1fq7n0mn22zl9s";}
+  {name="ksnapshot";value="0wf1bwkrhp714fhhh3y82p35rxk7prwqsn89nsl7rj3l7gryismp";}
+  {name="kstars";value="0bbnf8vnhinmgb03dab7ji2rpb3k2d901nm5r11lxwjdv58d4vkn";}
+  {name="ktouch";value="1b354imxnfv4yklzh0xd358gydczmlijkkjm2ks04111895h97b1";}
+  {name="kturtle";value="147sn2lrzxgfwiqxziymjvvy67sgwmdfcrgqvv93rmp5r9y3zmiy";}
+  {name="kwordquiz";value="1a2vifgixn6zgrp4nm5lvq41v24xp4nbnv8a7c9p53chx3y8i2px";}
+  {name="libkdcraw";value="1h49g41c2sxxzx6w865k2ljiqlgill7imh1pnkw1wsfwk4ii9msz";}
+  {name="libkdeedu";value="058gidzzda4ca4h2125ja17gdfq52zqdh70c22f6p4ph47qw503m";}
+  {name="libkexiv2";value="0vkl2gnp7saw26crj2hbg953knrv3v1pjd9c5d29vckdn5q417zr";}
+  {name="libkipi";value="00wnm45v65my7dp7g3sri54prjk1mkqi4nqf3f5xisnshi3vzr5f";}
+  {name="libksane";value="1w0d164lnc576irrxfi1f6rzv85wn5gawqp92yg8zqhna1zxjhzp";}
+  {name="marble";value="1964ix9dcssw4bny944rdwhxifnj5ay6nmbhvbvwq1d77ckzz9sf";}
+  {name="mobipocket";value="1npmbkvrg1kil6sh91m79kavfrivkk3jpb0c0spm0s93b85pgvky";}
+  {name="okular";value="0fw49r0hskhscml18715yqxxwrzigrx0rkhcljgckss7bksyfsfn";}
+  {name="oxygen-icons";value="1gwpsh7iwmzl1n9wzp8q95jlimbmygcrqwkzzp9jwsyfl9qn86y5";}
+  {name="parley";value="0c8k3sxpzxnaldvyskfp86cnhrzabq8alkv32ikr3y948ib9q31m";}
+  {name="perlkde";value="01ysn4bq5zjc0b8gqyinx08scimiix505zvdw13a9axfb4vnk05j";}
+  {name="perlqt";value="067hj2fw2jvd6d0ywdmq6y630ygm6xjrvkrnhm3czqxpfs6hp2mk";}
+  {name="pykde4";value="106kjcbg2gpgj7kypg79yjb2b3jbcc8zfslc65vkb32ivipk0j16";}
+  {name="qtruby";value="1dp3zdh5m3yp55r7pwxi4nqfjsfv84qcg9n5msp7lw78k04xidg7";}
+  {name="qyoto";value="1kynbz0gpjbq5xdpfv1by39cxji1z3wisv8c6bgxz7yknqp16qix";}
+  {name="rocs";value="1mlvw0fb83f0vjdf0amlx92w2fvjl79rcvhlv267vsw0idd3vp2g";}
+  {name="smokegen";value="1j0apyqv17fycysfjc0mf4rhq2g6zwn9fz7dsib1hylza813smxr";}
+  {name="smokekde";value="1zgf2pcxwxzhjhab46q2ir1ys4mq2xf9ais9473xc6xjvrbg74dd";}
+  {name="smokeqt";value="19xfpm9as6sbsfjsn8qiqnlfsqwpri56886kl9kp7qhr6dga54ma";}
+  {name="step";value="1819shriclbp1ny28gjik1mg1c3mvm4drk0c84zcq2vj6dz2fp61";}
+  {name="svgpart";value="1wcjbhl608y7a0rzwziaja7zi1kjixcnmwaik5xyss2hmx59m934";}
+];
+modules=[
+{
+  module="kdegraphics";
+  split=true;
+  pkgs=[
+    { name="gwenview";  }
+    { name="kamera";  }
+    { name="kcolorchooser";  }
+    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+    { name="kgamma";  }
+    { name="kolourpaint";  }
+    { name="kruler";  }
+    { name="ksaneplugin";  }
+    { name="ksnapshot";  }
+    { name="libkdcraw";  }
+    { name="libkexiv2";  }
+    { name="libkipi";  }
+    { name="libksane";  }
+    { name="mobipocket";  }
+    { name="okular";  }
+    { name="svgpart";  }
+  ];
+}
+{
+  module="kdeedu";
+  split=true;
+  pkgs=[
+    { name="blinken";  }
+    { name="cantor";  }
+    { name="kalgebra";  }
+    { name="kalzium";  }
+    { name="kanagram";  }
+    { name="kbruch";  }
+    { name="kgeography";  }
+    { name="khangman";  }
+    { name="kig";  }
+    { name="kiten";  }
+    { name="klettres";  }
+    { name="kmplot";  }
+    { name="kstars";  }
+    { name="ktouch";  }
+    { name="kturtle";  }
+    { name="kwordquiz";  }
+    { name="libkdeedu";  }
+    { name="marble";  }
+    { name="parley";  }
+    { name="rocs";  }
+    { name="step";  }
+  ];
+}
+{
+  module="kdebindings";
+  split=true;
+  pkgs=[
+    { name="kimono";  }
+    { name="korundum";  }
+    { name="kross-interpreters"; sane="kross_interpreters"; }
+    { name="perlkde";  }
+    { name="perlqt";  }
+    { name="pykde4";  }
+    { name="qtruby";  }
+    { name="qyoto";  }
+    { name="smokegen";  }
+    { name="smokekde";  }
+    { name="smokeqt";  }
+  ];
+}
+{
+  module="kde-baseapps";
+sane="kde_baseapps";  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="kde-baseapps"; sane="kde_baseapps"; }
+    { name="konsole";  }
+  ];
+}
+{ module="kdeaccessibility";  split=false;
+  pkgs=[
+    { name="kaccessible"; }
+    { name="kmag"; }
+    { name="kmouth"; }
+    { name="kmousetool"; }
+    { name="jovie"; }
+  ];
+
+}
+{ module="kdeadmin";  split=false;
+  pkgs=[
+    { name="strigi-analyzer"; sane="strigi_analyzer";}
+    { name="kuser"; }
+    { name="kcron"; }
+    { name="ksystemlog"; }
+    { name="system-config-printer-kde"; sane="system_config_printer_kde";}
+  ];
+
+}
+{ module="kdeartwork";  split=false;
+  pkgs=[
+    { name="ColorSchemes"; }
+    { name="IconThemes"; }
+    { name="emoticons"; }
+    { name="kscreensaver"; }
+    { name="kwin-styles"; sane="kwin_styles";}
+    { name="sounds"; }
+    { name="styles"; }
+    { name="wallpapers"; }
+    { name="HighResolutionWallpapers"; }
+    { name="WeatherWallpapers"; }
+    { name="desktopthemes"; }
+    { name="aurorae"; }
+  ];
+
+}
+{ module="kdegames";  split=false;}
+{ module="kdelibs";  split=false;}
+{ module="kdemultimedia";  split=false;}
+{ module="kdenetwork";  split=false;
+  pkgs=[
+    { name="kfile-plugins"; sane="kfile_plugins";}
+    { name="kget"; }
+    { name="kopete"; }
+    { name="krdc"; }
+    { name="kppp"; }
+    { name="krfb"; }
+    { name="kdnssd"; }
+    { name="filesharing"; }
+  ];
+
+}
+{ module="kdepim";  split=false;}
+{ module="kdepimlibs";  split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+{ module="kdesdk";  split=false;
+  pkgs=[
+    { name="cervisia"; }
+    { name="lokalize"; }
+    { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
+    { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
+    { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
+    { name="kcachegrind"; }
+    { name="kapptemplate"; }
+    { name="kpartloader"; }
+    { name="strigi-analyzer"; sane="strigi_analyzer";}
+    { name="kioslave"; }
+    { name="okteta"; }
+    { name="kmtrace"; }
+    { name="kompare"; }
+    { name="kprofilemethod"; }
+    { name="kstartperf"; }
+    { name="kuiviewer"; }
+    { name="poxml"; }
+    { name="scripts"; }
+    { name="umbrello"; }
+  ];
+
+}
+{ module="kdetoys";  split=false;
+  pkgs=[
+    { name="kteatime"; }
+    { name="ktux"; }
+    { name="amor"; }
+  ];
+
+}
+{ module="kdeutils";  split=false;
+  pkgs=[
+    { name="ark"; }
+    { name="kcalc"; }
+    { name="kremotecontrol"; }
+    { name="kdf"; }
+    { name="kfloppy"; }
+    { name="printer-applet"; sane="printer_applet";}
+    { name="filelight"; }
+    { name="kcharselect"; }
+    { name="kgpg"; }
+    { name="ktimer"; }
+    { name="kwallet"; }
+    { name="sweeper"; }
+    { name="superkaramba"; }
+  ];
+
+}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev";  split=false;
+  pkgs=[
+    { name="klinkstatus"; }
+    { name="kfilereplace"; }
+    { name="kimagemapeditor"; }
+    { name="kommander"; }
+  ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}
diff --git a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
index 10ce57cee6af..dbb5970ab64e 100755
--- a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
+++ b/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
@@ -33,6 +33,8 @@ if [[ ! -f kde_projects.xml ]]; then
 fi
 eval `xsltproc kde-submodules.xslt kde_projects.xml`
 
+module[kde-baseapps]=kde-baseapps
+
 print_sane() {
   echo "Called print_sane $1" >&2
   sane="${1//[^a-z0-9_]/_}"
@@ -62,38 +64,39 @@ done
 
 
 print_pkg_hash() {
-  echo -n "{name=\"${1}\";value=\"${hash[$1]}\";}"
+  echo "  {name=\"${1}\";value=\"${hash[$1]}\";}"
 }
 
 print_hashes(){
-  echo -n "hashes=builtins.listToAttrs["
+  echo "hashes=builtins.listToAttrs["
   for p in "${packages[@]}"; do print_pkg_hash "$p"; done
-  echo -n "];"
+  echo "];"
 }
 
 print_split_module(){
   echo -n "$1:" >&2
-  echo -n "{module=\"$1\";"
+  echo -e "{\n  module=\"$1\";"
   print_sane "$1"
-  echo -n "split=true;"
-  echo -n "pkgs=["
+  echo "  split=true;"
+  echo "  pkgs=["
   for p in "${packages[@]}"; do
     if [[ "${module[$p]}" == "$1" ]]; then
-      echo -n "{name=\"$p\";"
+      echo -n "    { name=\"$p\"; "
       print_sane "$p"
-      echo -n "}"
+      echo " }"
       echo -n " $p" >&2
     fi
   done
-  echo -n "];}"
+  echo "  ];"
+  echo "}"
   echo >&2
 }
 
 print_mono_module(){
-  echo -n "{module=\"$1\";"
+  echo -en "{ module=\"$1\"; "
   print_sane "$1"
   echo -n "$1 ... " >&2
-  echo -n "split=false;"
+  echo -n " split=false;"
   cml="$1-$release/CMakeLists.txt"
   tar -xf "${dir}/$1-${release}.tar.bz2" "$cml"
   if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
@@ -104,38 +107,39 @@ print_mono_module(){
         sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
         grep -v '\(doc\|cmake\)'` )
       echo " seems splittable, subdirs: ${subdirs[*]}" >&2
-      echo -n "pkgs=["
+      echo -e "\n  pkgs=["
       for s in "${subdirs[@]}"; do
-        echo -n "{name=\"${s//\//-}\";"
+        echo -en "    {"
+		echo -n " name=\"${s//\//-}\"; "
         print_sane "$s"
         if [[ $s != "${s//\//-}" ]]; then
-          echo -n "subdir=\"$s\";"
+          echo -n "subdir=\"$s\"; "
         fi
-        echo -n "}"
+        echo "}"
       done
-    echo -n "];"
+      echo -e "  ];\n"
     fi
   else
     echo " is monolithic (has no subdirs)" >&2
   fi
   rm $cml
   rmdir $1-$release
-  echo -n "}"
+  echo "}"
 }
 
 print_modules(){
-  echo -n "modules=["
+  echo "modules=["
   echo "Printing modules splitted by upstream" >&2
   for m in "${!modules[@]}"; do print_split_module "$m"; done
   echo >&2
   echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
   for m in "${top_level[@]}"; do print_mono_module "$m"; done
-  echo -n "];"
+  echo "];"
 }
 
 echo "Writing ${release}.nix" >&2
 exec > "${release}.nix"
-echo -n "{stable=${stable};"
+echo "{stable=${stable};"
 print_hashes
 print_modules
-echo -n "}"
+echo "}"
diff --git a/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix
similarity index 100%
rename from pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix
rename to pkgs/desktops/kde-4.7/kde-runtime.nix
diff --git a/pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix
similarity index 100%
rename from pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix
rename to pkgs/desktops/kde-4.7/kde-workspace.nix
diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix
new file mode 100644
index 000000000000..f4ecf8656cf7
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix
@@ -0,0 +1,262 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "03sl2d83hyl138kl7424nxi546v1x1yp5ywqknk194532gf7isf2";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "0dal1sdvr28d0w9izl6chzybp1xgnvl20yn59yszl9zfwxzm5z45";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "17galw35j93jsmdpihr2x1jrpz8phyrrw403q77xb7csdc89mg41";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "07llq52f0hxz39h2amq1an788m6bijijifk9hilbkiixs1bpcycp";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "0f07p6nz0gryjihz35ga4hn7gj32is978ns74mxkgql3cqkmzpp8";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "0lcmp4lrlzjx8003fdpgsz5xi33ldj5sxkim90y76866kwgfd8a0";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "10ja0jg6fqq0a9nx2lcljp4fmrvn8yicv75wchfmz6ydrylfmlmc";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "10xbbjq08r47pcxg6j8k3yyvfjf6fvk16f3njriclsrxg5kgjcb1";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "0w6fkkmqqx73mf3piwqfk98xyk8izvrxkhw653npm30j2x5l1ccf";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "1xpsly96d68kzswscfz7fj4xzk3z92ddlzs06jl5ga3vi5v08br9";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "12wpzdqx5ckkr3x7wsbyb6ljixm66cxsxw5vpxf987hm9pblip9c";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "11s8wlv3qpnd9hf39z53nan6ljxdvh17knaz1jl7a04f0dczc1hj";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "0a491igqcz1gb7218m9wflvrlyj0h95xlmsn70pb1jv0kvmpib7w";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "0c5fji14j8h7zpj5941wrl6nar76ll5ry2yhcdq82ciphc74421q";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "1bgmlj7s7rdzva5i3kdi0hf16kh929a9qmhg745ivbfl89slbi6c";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "1fail3mpmsb0zvskwrxzjx0bvsbf28rv5qjzh061w1a9jqd0ggn3";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "0hx6y2xzgvnhcvmdf7qh1bk1jk87srmxpi1m4blwqara189bmqz7";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "1fjdjaqplqs9jk0np4fj8sm9jds8i9hxxf64cqj0is6wcf7lf9bc";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "1j56aj0bhpgfzlxcav3rwzahxm6q00hpdg6jmgq0m02d45kvn8z5";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "1syxpqk37jwippx7p273f4h6n14jhbv22wmq8la48jsqdkgrrgjg";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "1jazhp4n5ymz5gbxc3g3c9jvd7k1fs2b1w09vhnbgwa6i3gpa1i8";
+}
+{
+  lang = "id";
+  saneName = "id";
+  sha256 = "1g85002i29g6qzmjrwng4pndrkxnkg1ph1qvkkrnkkpygbw3whvm";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "11aavg4gw7xcdaq72ygynm2zbjcmal0baaw6sk1gy597620hfm5g";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "1395nskpbg8ah2q18ahsfv39ixhw74gb5cxr2irsfkgnwbmglas1";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "0jrnbd8j6qcfhxvfs014qq0dbdbp6632bk2210xg07sfmrz43csm";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "0rxvj142rw40d93ygfysavpw4jbyn8yx6c828sv5lp8c2r4kid5a";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "12x5dnk33khmfnf9fk5qq3par1l21xfy24lq4a6jdf8ya9nj62r5";
+}
+{
+  lang = "kn";
+  saneName = "kn";
+  sha256 = "0c4cp019ij80fc188dzkv5nbxplxhnhqc3b2qda9xr1j78vbbh46";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "0lhnvy370fk21z1r1wdq484pdjq6c0jsj3s2z58z4x7rfw2lq487";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "1blcg57vm05sbvcgslr49k84whm3f99mcd15zb8fxvvrybg0hr2m";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "0jc2vv97jwbbr966spzv10aimb9c42x5ia1rnr2kvs1hb8sxwvp1";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "04362qr5p3dhscrppcbg9cj28idrs0hslc2lk98drpq2rkc8rjmb";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "1ci4xh56w6rn68sl5xk23l1rxxfz7ni7y4z2sc5yidwi1acxfwpm";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "197jdabjxk61n5b69sw9jqcpp7561hq3dw086z2pymqll5irjf7f";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "1cd0ifr6p9m8h665grwy8nk3gw72w9h5a8bygf5nj55164qmff98";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "1scn7nkl521v1f1y0km3s57s02xfblblg2f572s9yz5j2da9p2j0";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "1qn6lakcfah85ws9njz2xp36xj2n3ld3mhqkvcb6mddv943x65vj";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "0pw2zvma1jczkp0ypshxyl4dcnx6jakms91i2pwyswa8jv3mfx3b";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "1n9m7wj5gd3kwf6smbx53l3jbjyvd26ginw007bnv6x14g2y7k19";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "155l1szxvjcgmw44097q8dvgd9ljgs2y3dn8mpi3y6cqj5kdb42s";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "166ck2pvhdrpyf269fmkqkqs3l6s4cc8f2p3w88f5z75qg9xc3bj";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "18bidvnhg2gqnjgr6np1gm2irn81b108kx7ri11gwppqh3h90340";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "0c2av80r3zc1jkybj3yp5hspv5rwlyda039jy11y49d6zwval097";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "0dffkmsd9l30c17fi5x6m6lx5hi5diqqxmmn36a9wb393mw8srm9";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "10rrlrwarh8sks2wym2kq3rk69kgzqk38ll93i0i0zhjgyqiahrg";
+}
+{
+  lang = "th";
+  saneName = "th";
+  sha256 = "1sqyw6zd3vnpkvb7iisqhnk7vjp3212h97yqgmlsxfry2rys1kmr";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "0vzr81c004zwxqhfwhpfs4g1w5dvbxzb9y3g3vsagnsc94i5fb9y";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "0p0ln8dcpq2hbqz651lb7izb82dqhh5pl3a931yzd99a6lr3kd39";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "0b6q2s1qigzchqs9dmzm31jrnhz3vfsix4zbmzs0wdib05qy6y1f";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "01hi12hanz44lbn52dcll2glcljax1mv3n5qc8w9gf4cqjjrs2ia";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "0iwszbl2myh9ik3yk19nyrj43rcki23amp5i2sx7lz9gy14lvgl8";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "1j1kvyc82ysin4ksp63gzczg4ihvn4qlfjd5l16qi0galp96mz21";
+}
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1cc581c6f23..138b8ff624a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7879,7 +7879,8 @@ let
 
       digikam = callPackage ../applications/graphics/digikam { };
 
-      filelight = callPackage ../applications/misc/filelight { };
+      filelight = if kde4 ? filelight then kde4.filelight
+        else callPackage ../applications/misc/filelight { };
 
       k3b = callPackage ../applications/misc/k3b { };