diff --git a/.SRCINFO b/.SRCINFO
index c903aea359076..9b56f3ecc61d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,7 +14,6 @@ pkgbase = nextpnr-ice40-nightly
 	makedepends = gawk
 	makedepends = eigen
 	makedepends = boost
-	makedepends = icestorm-nightly
 	depends = yosys-nightly
 	depends = icestorm-nightly
 	depends = python
diff --git a/PKGBUILD b/PKGBUILD
index 38215885ca43b..c29dde4ca865e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,14 +18,14 @@ depends=(
 	"qt5-base"
 )
 optdepends=()
-makedepends=("git" "gcc" "cmake" "ninja" "pkgconf" "gawk" "eigen" "boost" "icestorm-nightly")
+makedepends=("git" "gcc" "cmake" "ninja" "pkgconf" "gawk" "eigen" "boost")
 conflicts=(
 	"nextpnr-git"
 	"nextpnr-all-nightly"
 )
 replaces=()
 source=(
-	"nextpnr::git+https://github.com/YosysHQ/nextpnr.git"#commit=d3b53d8e
+	"nextpnr::git+https://github.com/YosysHQ/nextpnr.git#commit=d3b53d8e"
 )
 sha256sums=(
 	"SKIP"
diff --git a/PKGBUILD.in b/PKGBUILD.in
index 051d6e406f22f..ff1bc24266de4 100644
--- a/PKGBUILD.in
+++ b/PKGBUILD.in
@@ -1,7 +1,7 @@
 # Maintainer: Aki-nyan <aur@catgirl.link>
 
 pkgname=nextpnr-ice40-nightly
-pkgver=@NPR_VER@
+pkgver=@EDA_VER@
 pkgrel=1
 epoch=1
 pkgdesc="nextpnr portable FPGA place and route tool - for ice40"
@@ -18,14 +18,14 @@ depends=(
 	"qt5-base"
 )
 optdepends=()
-makedepends=("git" "gcc" "cmake" "ninja" "pkgconf" "gawk" "eigen" "boost" "icestorm-nightly")
+makedepends=("git" "gcc" "cmake" "ninja" "pkgconf" "gawk" "eigen" "boost")
 conflicts=(
 	"nextpnr-git"
 	"nextpnr-all-nightly"
 )
 replaces=()
 source=(
-	"nextpnr::git+https://github.com/YosysHQ/nextpnr.git"#commit=@NPR_HASH@
+	"nextpnr::git+https://github.com/YosysHQ/nextpnr.git#commit=@EDA_HASH@"
 )
 sha256sums=(
 	"SKIP"