diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix
index 80d04080aac3..312facde9489 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/pkgs/development/compilers/terra/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, fetchurl, llvmPackages, ncurses, lua }:
 
 let
-  luajitArchive = "LuaJIT-2.0.4.tar.gz";
+  luajitArchive = "LuaJIT-2.0.5.tar.gz";
   luajitSrc = fetchurl {
     url = "http://luajit.org/download/${luajitArchive}";
-    sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2";
+    sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
   };
 in
 
 stdenv.mkDerivation rec {
   name = "terra-git-${version}";
-  version = "2016-06-09";
+  version = "1.0.0-beta1";
 
   src = fetchFromGitHub {
     owner = "zdevito";
     repo = "terra";
-    rev = "22696f178be8597af555a296db804dba820638ba";
-    sha256 = "1c2i9ih331304bh31c5gh94fx0qa49rsn70pvczvdfhi8pmcms6g";
+    rev = "release-${version}";
+    sha256 = "1blv3mbmlwb6fxkck6487ck4qq67cbwq6s1zlp86hy2wckgf8q2c";
   };
 
   outputs = [ "bin" "dev" "out" "static" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ef0f40e4c2b..41769d3bed0c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7624,9 +7624,7 @@ in
   tbb = callPackage ../development/libraries/tbb { };
 
   terra = callPackage ../development/compilers/terra {
-    llvmPackages = llvmPackages_38 // {
-      llvm = llvmPackages_38.llvm.override { enableSharedLibraries = false; };
-    };
+    llvmPackages = llvmPackages_6;
     lua = lua5_1;
   };