diff --git a/src/python-configshell-fb/PKGBUILD b/src/python-configshell-fb/PKGBUILD
index d3621b2..1672b68 100644
--- a/src/python-configshell-fb/PKGBUILD
+++ b/src/python-configshell-fb/PKGBUILD
@@ -1,16 +1,16 @@
-# Contributor: Johannes Dewender  arch at JonnyJD dot net 
+# Contributor: Johannes Dewender  arch at JonnyJD dot net
 pkgname=('python-configshell-fb' 'python2-configshell-fb')
 _pkgname=configshell-fb
-pkgver=1.1.fb22
+pkgver=1.1.fb23
 pkgrel=1
 pkgdesc="python framework for building simple CLI applications (free branch)"
 arch=('any')
-url="https://github.com/agrover/configshell-fb"
+url="https://github.com/open-iscsi/configshell-fb"
 license=('Apache')
 options=()
 makedepends=('python-setuptools' 'python2-setuptools')
-source=(https://fedorahosted.org/releases/t/a/targetcli-fb/$_pkgname-$pkgver.tar.gz)
-sha256sums=('a20b95791cdba6f7587869f4fa4337e8e4effbdec102ac6f7de349fe3b5bc612')
+source=(https://github.com/open-iscsi/configshell-fb/archive/v${pkgver}.tar.gz)
+sha512sums=('71e2a30f3a484fb416ca8bda22c49c27a3abb8c826dc5ab06d5fe73dc0e0ccb3960934176164a9e37770b2b9ec6906ac1c922f418ef452e9f025fbb906517df1')
 
 package_python-configshell-fb() {
   depends=('python-pyparsing' 'python-urwid')
diff --git a/src/python-rtslib-fb/PKGBUILD b/src/python-rtslib-fb/PKGBUILD
index 15d838f..9ab45f5 100644
--- a/src/python-rtslib-fb/PKGBUILD
+++ b/src/python-rtslib-fb/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
 pkgname=('python-rtslib-fb' 'python2-rtslib-fb')
 _pkgname=rtslib-fb
-pkgver=2.1.fb62
+pkgver=2.1.fb63
 pkgrel=1
 pkgdesc="free branch version of the LIO target API"
 arch=('any')
@@ -11,13 +11,13 @@ makedepends=('python-setuptools' 'python2-setuptools' 'python-pyudev' 'python2-p
 backup=()
 options=()
 install=
-source=(https://fedorahosted.org/releases/t/a/targetcli-fb/$_pkgname-$pkgver.tar.gz target.service)
-sha256sums=('45ab59d7b97fc62613dd24b153a543cc16e1f0cca7ae38b86e4b0c2cc16ac10c'
-            '74b9e5c11eab1781aa8b43680b429080ae800fbcdafd29626791b5426a4cdea8')
+source=(https://github.com/agrover/rtslib-fb/archive/v${pkgver}.tar.gz target.service)
+sha512sums=('faf5732299def9f5eb9147f930e8b48c9e9a26a918b41aa60f06a1f079e6e0453eb3c2d19136b244ef2349c23d31b7fa15cb4a0b6302ffbcd878033a45a11d1a'
+            '3c634f1c466d0a8c3dd2b57a230438aaeeb0e66324863a2ded57dd69a2ca5946f83c4ab511766f510f3e63b43aedcf7e368bcf5bc325ee69c016bb0bb2612de5')
+
 
 prepare() {
   cd "$srcdir/$_pkgname-$pkgver"
-  #patch -p1 < ../setup-syntax.patch
 }
 
 
diff --git a/src/targetcli-fb/PKGBUILD b/src/targetcli-fb/PKGBUILD
index fb4dcf5..a3a6ffa 100644
--- a/src/targetcli-fb/PKGBUILD
+++ b/src/targetcli-fb/PKGBUILD
@@ -1,10 +1,10 @@
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
 pkgname=targetcli-fb
-pkgver=2.1.fb45
+pkgver=2.1.fb46
 pkgrel=1
 pkgdesc="free branch of the targetcli LIO administration shell (iSCSI + Co)"
 arch=('any')
-url="https://github.com/agrover/targetcli-fb"
+url="https://github.com/open-iscsi/targetcli-fb"
 license=('Apache')
 groups=()
 depends=('python-rtslib-fb>=2.1.fb52' 'python-configshell-fb>=1.1.fb17'
@@ -15,8 +15,8 @@ provides=('targetcli')
 backup=()
 options=()
 install=
-source=(https://fedorahosted.org/releases/t/a/targetcli-fb/$pkgname-$pkgver.tar.gz)
-sha256sums=('f977897450521a848c077e0faf7d8025d0af1b8859e3abfaeecbf7083a08008c')
+source=(https://github.com/open-iscsi/targetcli-fb/archive/v${pkgver}.tar.gz)
+sha512sums=('239b59c3c9367f6e35e3a207aa1d605c99bc28dad07ae9cda7ffb1a9a2c7fdcb388708882369f73c6fb188f33d1dd9e45b8684826f274a1a71b51dec9be487ed')
 
 
 build() {