diff --git a/PKGBUILD b/aur-scripts/wofi-calc-git/PKGBUILD
similarity index 92%
rename from PKGBUILD
rename to aur-scripts/wofi-calc-git/PKGBUILD
index ce4847e..fde793d 100644
--- a/PKGBUILD
+++ b/aur-scripts/wofi-calc-git/PKGBUILD
@@ -11,8 +11,8 @@ depends=(wofi libqalculate)
 makedepends=(wofi libqalculate)
 checkdepends=()
 optdepends=()
-provides=(wofi-calc-git)
-conflicts=(wofi-calc-git)
+provides=(wofi-calc-git wofi-calc)
+conflicts=(wofi-calc-git wofi-calc)
 replaces=()
 backup=()
 options=()
diff --git a/push-git-aur.sh b/aur-scripts/wofi-calc-git/push-version.sh
similarity index 90%
rename from push-git-aur.sh
rename to aur-scripts/wofi-calc-git/push-version.sh
index ea0e790..48d5d1b 100755
--- a/push-git-aur.sh
+++ b/aur-scripts/wofi-calc-git/push-version.sh
@@ -1,3 +1,5 @@
+# Description: Generates a new aur release.
+
 # Generate the checksums automatically
 sed -i "s/^sha256sums=.*/$(makepkg -g -f -p PKGBUILD)/" ./PKGBUILD
 
diff --git a/aur-scripts/wofi-calc/PKGBUILD b/aur-scripts/wofi-calc/PKGBUILD
new file mode 100644
index 0000000..8d7108c
--- /dev/null
+++ b/aur-scripts/wofi-calc/PKGBUILD
@@ -0,0 +1,36 @@
+pkgname=wofi-calc
+pkgver=1.0
+pkgrel=1
+epoch=
+pkgdesc="A simple calculator for wofi, inspired in rofi-calc."
+arch=(any)
+url="https://github.com/Zeioth/wofi-calc.git"
+license=('MIT')
+groups=()
+depends=(wofi libqalculate)
+makedepends=(wofi libqalculate)
+checkdepends=()
+optdepends=()
+provides=(wofi-calc-git wofi-calc)
+conflicts=(wofi-calc-git wofi-calc)
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=("https://raw.githubusercontent.com/Zeioth/wofi-calc/master/wofi-calc.sh")
+noextract=()
+sha256sums=('0bc4930e7df685389309198ce214ebf3b88aee71ca0198f586ff0afe6bea716b')
+validpgpkeys=()
+
+pkgver() {
+  cd "${_pkgname}"
+  printf "1.0.r%s" "$(git rev-list --count --tags)"
+}
+
+
+package() {
+   # Note: 'install' is a chmod+cp one-liner command by GNU
+   mkdir -p "$pkgdir"/usr/bin
+   install -m 111 "${srcdir}"/wofi-calc.sh "$pkgdir"/usr/bin/wofi-calc
+}
diff --git a/aur-scripts/wofi-calc/push-version.sh b/aur-scripts/wofi-calc/push-version.sh
new file mode 100755
index 0000000..115a00d
--- /dev/null
+++ b/aur-scripts/wofi-calc/push-version.sh
@@ -0,0 +1,25 @@
+# Description: Generates a new aur release.
+
+#-----------------------------------------------------------------------------
+# TODO: On github/gitlab, create automation to create git version per tag
+#       This is just in case an user tries to download an specific version.
+#-----------------------------------------------------------------------------
+
+
+# Generate the checksums automatically
+sed -i "s/^sha256sums=.*/$(makepkg -g -f -p PKGBUILD)/" ./PKGBUILD
+
+# Generate tag a new tag for the new version
+git tag $(printf "v1.0.r%s" "$(git rev-list --count HEAD)")
+
+# Generate pagkage metadata
+makepkg --printsrcinfo > .SRCINFO
+
+# Push it to AUR
+git add PKGBUILD .SRCINFO
+git commit -m "New version"
+git push ssh://aur@aur.archlinux.org/wofi-calc.git master
+
+# Bye
+echo -e "\n-------------------------------------------------------------------"
+echo -e "NEW VERSION GENERATED\n"
diff --git a/push-stable-aur.sh b/push-stable-aur.sh
deleted file mode 100755
index 3b7c1f3..0000000
--- a/push-stable-aur.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generate the checksums automatically
-sed -i "s/^sha256sums=.*/$(makepkg -g -f -p PKGBUILD)/" ./PKGBUILD
-
-# Generate pagkage metadata
-makepkg --printsrcinfo > .SRCINFO
-
-# Push it to AUR
-git add PKGBUILD .SRCINFO
-git commit -m "New version"
-git push ssh://aur@aur.archlinux.org/wofi-calc.git master
-
-# Bye
-echo -e "\n-------------------------------------------------------------------"
-echo -e "NEW VERSION GENERATED\n"