diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
index d171cfebf92..cde1cb2534b 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
@@ -11,5 +11,7 @@ stdenv.mkDerivation {
     description = "OTR plugin for Pidgin IM.";
   };
 
+  postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";
+
   buildInputs = [libotr pidgin];
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/pidgin-latex/default.nix
rename to pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3aa0d50461..0c4e8fe3277 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3066,7 +3066,7 @@ rec {
     inherit (xlibs) libXScrnSaver;
   };
 
-  pidginlatex = import ../applications/networking/instant-messengers/pidgin-latex {
+  pidginlatex = import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex {
 	inherit fetchurl stdenv tetex pkgconfig imagemagick ghostscript pidgin;
 	inherit (gtkLibs) glib gtk;
   };