diff --git a/.SRCINFO b/.SRCINFO
index 4e84569a68c..246a513f7eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = nbimg
 	pkgdesc = Allows to convert HTC Splash Screen images from NB to BMP and create NB splash screens from BMP format
-	pkgver = 1.1
+	pkgver = 1.2.1
 	pkgrel = 1
 	url = http://pof.eslack.org/2008/07/03/nbimg-htc-splash-screen-tool/
 	arch = x86_64
 	arch = i686
-	license = GPL
-	source = http://pof.eslack.org/HTC/nbimg/nbimg-1.1.tar.gz
-	md5sums = e1e49ef98311abfa8de7375294a1f1d9
+	license = GPL3
+	source = https://github.com/poliva/nbimg/archive/v1.2.1.tar.gz
+	source = Makefile.patch
+	md5sums = 4cff29b5437f909bba470e4f2b0b861b
+	md5sums = 24fe500b72243ab6d52776583e64fdfa
 
 pkgname = nbimg
 
diff --git a/Makefile.patch b/Makefile.patch
new file mode 100644
index 00000000000..6ca18822271
--- /dev/null
+++ b/Makefile.patch
@@ -0,0 +1,12 @@
+diff -Naur nbimg-1.2.1/Makefile nbimg-1.2.1.patched/Makefile
+--- nbimg-1.2.1/Makefile	2012-06-21 09:40:47.000000000 +0200
++++ nbimg-1.2.1.patched/Makefile	2013-01-07 13:32:48.282389871 +0100
+@@ -20,7 +20,7 @@
+ win32:
+ 	i586-mingw32msvc-gcc $(CFLAGS) $(PROGNAME).c -o $(PROGNAME).exe	
+ 
+-install: all
++install:
+ 	mkdir -p $(bindir)
+ 	$(INSTALL) $(PROGNAME) $(bindir)/$(PROGNAME)
+ 	mkdir -p $(docdir)/$(PROGNAME)/
diff --git a/PKGBUILD b/PKGBUILD
index d2b224cb825..02a9b42601d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,24 @@
-# Maintainer: Your Name <youremail@domain.com>
+# Maintainer: Cedric Girard <girard.cedric@gmail.com>
 pkgname=nbimg
-pkgver=1.1
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="Allows to convert HTC Splash Screen images from NB to BMP and create NB splash screens from BMP format"
 arch=('x86_64' 'i686')
 url="http://pof.eslack.org/2008/07/03/nbimg-htc-splash-screen-tool/"
-license=('GPL')
-depends=()
-makedepends=()
-source=(http://pof.eslack.org/HTC/nbimg/$pkgname-$pkgver.tar.gz)
-md5sums=('e1e49ef98311abfa8de7375294a1f1d9')
+license=('GPL3')
+source=(https://github.com/poliva/nbimg/archive/v${pkgver}.tar.gz Makefile.patch)
+md5sums=('4cff29b5437f909bba470e4f2b0b861b'
+         '24fe500b72243ab6d52776583e64fdfa')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  gcc -o nbimg nbimg.c
+  patch -p1 < ../Makefile.patch
+  make nbimg
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  install -d "$pkgdir/usr/bin"
-  cp $srcdir/$pkgname-$pkgver/nbimg $pkgdir/usr/bin
+  make DESTDIR="$pkgdir/" install
 
 }