diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix
new file mode 100644
index 000000000000..be6970f01e16
--- /dev/null
+++ b/pkgs/applications/audio/gigedit/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45
+, docbook_xsl, gtkmm, intltool, libgig, libsndfile, libtool, libxslt
+, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "gigedit-svn-${version}";
+  version = "2342";
+
+  src = fetchsvn {
+    url = "https://svn.linuxsampler.org/svn/gigedit/trunk";
+    rev = "${version}";
+    sha256 = "0wi94gymj0ns5ck9lq1d970gb4gnzrq4b57j5j7k3d6185yg2gjs";
+  };
+
+  patchPhase = "sed -e 's/which/type -P/g' -i Makefile.cvs";
+
+  preConfigure = "make -f Makefile.cvs";
+
+  buildInputs = [ 
+    autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm intltool
+    libgig libsndfile libtool libxslt pkgconfig 
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.linuxsampler.org;
+    description = "Gigasampler file access library";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix
new file mode 100644
index 000000000000..a100390c2708
--- /dev/null
+++ b/pkgs/applications/audio/linuxsampler/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison
+, jackaudio, libgig, libsndfile, libtool , pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "linuxsampler-svn-${version}";
+  version = "2340";
+
+  src = fetchsvn {
+    url = "https://svn.linuxsampler.org/svn/linuxsampler/trunk";
+    rev = "${version}";
+    sha256 = "0zsrvs9dwwhjx733m45vfi11yjkqv33z8qxn2i9qriq5zs1f0kd7";
+  };
+
+  patchPhase = "sed -e 's/which/type -P/g' -i scripts/generate_parser.sh";
+
+  preConfigure = "make -f Makefile.cvs";
+
+  buildInputs = [ 
+   alsaLib asio autoconf automake bison jackaudio libgig libsndfile
+   libtool pkgconfig 
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.linuxsampler.org;
+    description = "Sampler backend";
+    longDescription = ''
+      Includes sampler engine, audio and MIDI drivers, network layer
+      (LSCP) API and native C++ API.
+
+      LinuxSampler is licensed under the GNU GPL with the exception
+      that USAGE of the source code, libraries and applications FOR
+      COMMERCIAL HARDWARE OR SOFTWARE PRODUCTS IS NOT ALLOWED without
+      prior written permission by the LinuxSampler authors. If you
+      have questions on the subject, that are not yet covered by the
+      FAQ, please contact us.
+    ''; 
+    license = licenses.gpl2;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix
new file mode 100644
index 000000000000..6129ef42f3dc
--- /dev/null
+++ b/pkgs/development/libraries/libgig/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchsvn, autoconf, automake, libsndfile, libtool, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "libgig-svn-${version}";
+  version = "2334";
+
+  src = fetchsvn {
+    url = "https://svn.linuxsampler.org/svn/libgig/trunk";
+    rev = "${version}";
+    sha256 = "0i7sj3zm6banl5avjdxblx0mlbxxzbsbr4x5hsl2fhrdsv5dnxhc";
+  };
+
+  buildInputs = [ autoconf automake libsndfile libtool pkgconfig ];
+
+  preConfigure = "make -f Makefile.cvs";
+
+  meta = with stdenv.lib; {
+    homepage = http://www.linuxsampler.org;
+    description = "Gigasampler file access library";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c80694ff6ef9..8128fb85c388 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4025,6 +4025,8 @@ let
   libgdata = (newScope gnome) ../development/libraries/libgdata {};
   libgdata_0_6 = (newScope gnome) ../development/libraries/libgdata/0.6.nix {};
 
+  libgig = callPackage ../development/libraries/libgig { };
+
   libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };
   libgnome_keyring3 = callPackage ../development/libraries/libgnome-keyring/3.x.nix { };
 
@@ -6879,6 +6881,8 @@ let
 
   geeqie = callPackage ../applications/graphics/geeqie { };
 
+  gigedit = callPackage ../applications/audio/gigedit { };
+
   gqview = callPackage ../applications/graphics/gqview { };
 
   gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk {
@@ -7049,6 +7053,8 @@ let
     inherit (gnome) libglade;
   };
 
+  linuxsampler = callPackage ../applications/audio/linuxsampler { };
+
   lmms = callPackage ../applications/audio/lmms { };
 
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };