diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix
new file mode 100644
index 000000000000..c8cb08eef281
--- /dev/null
+++ b/pkgs/applications/version-management/veracity/default.nix
@@ -0,0 +1,49 @@
+x@{builderDefsPackage
+  , cmake, curl, patch, zlib, icu, sqlite, libuuid
+  , readline, openssl, spidermonkey_1_8_0rc1
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  s = import ./src-for-default.nix;
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+    
+in
+rec {
+  src = a.fetchUrlFromSrcInfo s;
+
+  inherit (s) name;
+  inherit buildInputs;
+
+  phaseNames = ["prepareMakefiles" "doMake" "doDeploy"];
+
+  prepareMakefiles = a.fullDepEntry ''
+    find src -type f -exec sed -e 's@#include \([<"]\)sgbrings/js/js@#include \1js/js@g' -i '{}' ';'
+    cd ..
+    mkdir build
+    cd build
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lssl"
+    cmake -G "Unix Makefiles" -D SGBRINGS_JS_INCDIR="${spidermonkey_1_8_0rc1}/include" -D SGBRINGS_JS_LIB="${spidermonkey_1_8_0rc1}/lib/libjs.a" ../veracity*
+  '' ["minInit" "addInputs" "doUnpack"];
+
+  doDeploy = a.fullDepEntry ''
+    ensureDir "$out/bin" "$out/share/veracity/"
+    cp -r .. "$out/share/veracity/build-dir"
+    ln -s "$out/share/veracity/build-dir/build/src/cmd/vv" "$out/bin"
+    ln -s "$out/share/veracity/build-dir/build/src/script/vscript" "$out/bin"
+  '' ["doMake" "minInit" "defEnsureDir"];
+
+  meta = {
+    description = "A distributed version control system with template-based merging";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux ;
+  };
+}) x
+
diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
new file mode 100644
index 000000000000..48a6678071c3
--- /dev/null
+++ b/pkgs/applications/version-management/veracity/src-for-default.nix
@@ -0,0 +1,8 @@
+rec {
+   version="0.3.0.10246";
+   name="veracity-0.3.0.10246";
+   hash="03wn6dzbjv5p50xmiznynza5c1nk38v95mzv6rk6km1ykqprnlw0";
+   url="http://download-us.sourcegear.com/Veracity/0.3.0.10246/veracity-source-${version}.tar.gz";
+   advertisedUrl="http://download-us.sourcegear.com/Veracity/0.3.0.10246/veracity-source-0.3.0.10246.tar.gz";
+  
+}
diff --git a/pkgs/applications/version-management/veracity/src-info-for-default.nix b/pkgs/applications/version-management/veracity/src-info-for-default.nix
new file mode 100644
index 000000000000..f597a59bbaf5
--- /dev/null
+++ b/pkgs/applications/version-management/veracity/src-info-for-default.nix
@@ -0,0 +1,4 @@
+{
+  downloadPage = "http://sourcegear.com/veracity/downloads.html";
+  baseName = "veracity";
+}
diff --git a/pkgs/development/interpreters/spidermonkey/Makefile.extra b/pkgs/development/interpreters/spidermonkey/Makefile.extra
index 278ee7b8cc3a..a764cfc69cb6 100644
--- a/pkgs/development/interpreters/spidermonkey/Makefile.extra
+++ b/pkgs/development/interpreters/spidermonkey/Makefile.extra
@@ -4,4 +4,7 @@ install: $(PROGRAM) $(SHARED_LIBRARY)
 	cp -v $(PROGRAM) $(DIST)/bin
 	cp -v $(SHARED_LIBRARY) $(LIBRARY) $(DIST)/lib
 	cp -v $(JS_HFILES) $(API_HFILES) $(OTHER_HFILES) $(DIST)/include
+	mkdir -pv $(DIST)/include/js
+	find . -name '*.h' -exec cp '{}' $(DIST)/include/js ';'
+	find . -name '*.msg' -exec cp '{}' $(DIST)/include/js ';'
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d494e08aded6..b4a4f07684f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6108,6 +6108,8 @@ let
     qt = qt3;
   };
 
+  veracity = callPackage ../applications/version-management/veracity {};
+
   viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix)
   {
     inherit monotone flup cheetahTemplate highlight ctags