diff --git a/Formula/arangodb.rb b/Formula/arangodb.rb
index 684f1424c3..26faf86cbc 100644
--- a/Formula/arangodb.rb
+++ b/Formula/arangodb.rb
@@ -2,14 +2,15 @@ require 'formula'
 
 class Arangodb < Formula
   homepage 'http://www.arangodb.org/'
-  url 'https://github.com/triAGENS/ArangoDB/archive/v1.2.2.tar.gz'
-  sha1 '1b4390e4ad100c93900651a522a21395d077b0e6'
+  url 'https://github.com/triAGENS/ArangoDB/archive/v1.2.3.tar.gz'
+  sha1 '14e77ce4c8fa0b55b371dee06d8ccf0edef5ba68'
 
   head "https://github.com/triAGENS/ArangoDB.git", :branch => 'unstable'
 
   devel do
-    url 'https://github.com/triAGENS/ArangoDB/archive/v1.3.alpha1.tar.gz'
-    sha1 '51173707f29bc7c239c06c5043776637b325766b'
+    version "1.3.0-alpha2"
+    url 'https://github.com/triAGENS/ArangoDB/archive/v1.3.0-alpha2.tar.gz'
+    sha1 '058c0edcba0d2e79c95b41ca2d717296d77dd9be'
   end
 
   depends_on 'icu4c'
@@ -17,16 +18,27 @@ class Arangodb < Formula
   depends_on 'v8'
 
   def install
-    system "./configure", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}",
-                          "--disable-relative",
-                          "--disable-all-in-one-icu",
-                          "--disable-all-in-one-libev",
-                          "--disable-all-in-one-v8",
-                          "--enable-mruby",
-                          "--datadir=#{share}",
-                          "--localstatedir=#{var}"
+    args = %W[
+      --disable-dependency-tracking
+      --prefix=#{prefix}
+      --disable-relative
+      --disable-all-in-one-icu
+      --disable-all-in-one-libev
+      --disable-all-in-one-v8
+      --enable-mruby
+      --datadir=#{share}
+      --localstatedir=#{var}
+    ]
 
+    if build.devel?
+      args << "--program-suffix=-#{version}"
+    end
+
+    if build.head?
+      args << "--program-suffix=-unstable"
+    end
+
+    system "./configure", *args
     system "make install"
 
     (var+'arangodb').mkpath