diff --git a/pkgbuild/PKGBUILD b/pkgbuild/PKGBUILD
index 194d549b8..2ce928d5c 100644
--- a/pkgbuild/PKGBUILD
+++ b/pkgbuild/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Enlightenment Developers <enlightenment-devel@enlightenment.org>>
-pkgname=enlightenment-git
-pkgver=0.18.0rc2.17382.ed1a5e4
+pkgname=enlightenment
+[[ -d ../.git ]] && pkgname=$pkgname-git
+pkgver=0.18.0rc2.17432.569bc2e
 pkgrel=1
 pkgdesc="Enlightenment window manager - GIT development snapshot"
 arch=('i686' 'x86_64' 'arm')
@@ -11,8 +12,9 @@ depends=('elementary' 'xcb-util-keysyms' 'hicolor-icon-theme' 'pixman' 'mesa'
 optdepends=('connman: network module'
             'acpid: power events on laptop lid close'
             'gdb: create backtraces on crash')
-provides=("enlightenment17=$pkgver" 'notification-daemon')
-conflicts=("enlightenment17")
+[[ -d ../.git ]] && makedepends=('git')
+provides=("enlightenment=$pkgver" "enlightenment17=$pkgver" 'notification-daemon')
+conflicts=('enlightenment<1.0' 'enlightenment17')
 backup=('etc/enlightenment/sysactions.conf'
         'etc/xdg/menus/enlightenment.menu')
 options=('debug')
@@ -21,20 +23,25 @@ install=enlightenment.install
 pkgver() {
   cd "../.."
 
-  for _i in v_maj v_min v_mic; do
-    local v_ver=$v_ver.$(grep -m1 $_i configure.ac | sed 's/m4//' | grep -o "[[:digit:]]*")
-  done
+  if [[ -d .git ]]; then
+    for _i in v_maj v_min v_mic; do
+      local v_ver=$v_ver.$(grep -m1 $_i configure.ac | sed 's/m4//' | grep -o "[[:digit:]]*")
+    done
 
-  v_ver=$(awk -F , -v v_ver=${v_ver#.} '/^AC_INIT/ {gsub(/v_ver/, v_ver); gsub(/[\[\] -]/, ""); print $2}' configure.ac)
+    v_ver=$(awk -F , -v v_ver=${v_ver#.} '/^AC_INIT/ {gsub(/v_ver/, v_ver); gsub(/[\[\] -]/, ""); print $2}' configure.ac)
 
-  printf "$v_ver.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+    printf "$v_ver.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  else
+    ./configure --version | awk '/^enlightenment/ {gsub("-", ""); print $NF}'
+  fi
 }
 
 build() {
   cd "../.."
   export CFLAGS="$CFLAGS -fvisibility=hidden -fomit-frame-pointer"
   [[ -e Makefile ]] && make clean distclean
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc --enable-wayland-clients --enable-wayland-egl
+  [[ -e autogen.sh ]] && _configure=autogen.sh || _configure=configure
+  ./$_configure --prefix=/usr --sysconfdir=/etc --enable-wayland-clients --enable-wayland-egl
   make
 }