diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
new file mode 100644
index 000000000000..cd7f0b78c235
--- /dev/null
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, qt4, popplerQt4, zlib}:
+
+stdenv.mkDerivation rec {
+  pname = "texstudio";
+  version = "2.7.0";
+  name = "${pname}-${version}";
+  altname="Texstudio";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/texstudio/${name}.tar.gz";
+    sha256 = "167d78nfk265jjvl129nr70v8ladb2rav2qyhw7ngr6m54gak831";
+  };
+
+  buildInputs = [ qt4 popplerQt4 zlib ];
+
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${popplerQt4}/include/poppler/qt4) "
+    qmake PREFIX=$out texstudio.pro
+  '';
+
+  meta = with stdenv.lib; {
+    description = "TeX and LaTeX editor";
+    longDescription=''
+	Fork of TeXMaker, this editor is a full fledged IDE for 
+	LaTeX editing with completion, structure viewer, preview,
+	spell checking and support of any compilation chain.
+	'';
+    homepage = "http://texstudio.sourceforge.net/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cfouche ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90123a6d8263..55bdd52635ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2061,6 +2061,8 @@ let
 
   texmaker = callPackage ../applications/editors/texmaker { };
 
+  texstudio = callPackage ../applications/editors/texstudio { };
+
   tiled-qt = callPackage ../applications/editors/tiled-qt { qt = qt4; };
 
   tinc = callPackage ../tools/networking/tinc { };