diff --git a/make/PKGBUILD b/make/PKGBUILD
index 809cce47a..32ea4000d 100644
--- a/make/PKGBUILD
+++ b/make/PKGBUILD
@@ -1,27 +1,56 @@
-# $Id: PKGBUILD 77792 2010-04-18 03:42:45Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
+#
+# Chakra Packages, part of chakra-project.org
+#
+# maintainer: abveritas@chakra-project.org>
+
 
 pkgname=make
-pkgver=3.81
-pkgrel=6
+pkgver=3.82
+pkgrel=1
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/make"
-license=('GPL')
+license=('GPL3')
 groups=('base-devel')
 depends=('glibc' 'sh')
 install=$pkgname.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('a4e9494ac6dc3f6b0c5ff75c5d52abba')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        bug30612.patch
+        bug30723.patch
+        make-3.82-sort-blank.patch
+        make-3.82-makeflags.patch)
+md5sums=('1a11100f3c63fcf5753818e59d63088f'
+         'c8f496b22191f9fb9420ab14c1a19a47'
+         '662e6450e19a5acdaa5c9fcb8ad78dea'
+         '7d01a99f389d8f08dec93ed479071ee4'
+         'c62acc8a2925362bd780cb5d4206d5c3')
+
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --mandir=/usr/share/man --infodir=/usr/share/info
+  
+  # http://savannah.gnu.org/bugs/?30612
+  patch -Np1 -i $srcdir/bug30612.patch
+  
+  # http://savannah.gnu.org/bugs/?30723
+  patch -Np1 -i $srcdir/bug30723.patch
+  
+  # fix from Fedora
+  patch -Np1 -i $srcdir/make-3.82-sort-blank.patch
+  
+  # https://savannah.gnu.org/support/index.php?107487
+  # https://savannah.gnu.org/bugs/?33873
+  patch -Np0 -i $srcdir/make-3.82-makeflags.patch
+
+  ./configure --prefix=/usr
   make
 }
 
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
diff --git a/make/make.install b/make/make.install
index 0c2da13c3..a17b0b66f 100644
--- a/make/make.install
+++ b/make/make.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(make.info make.info-1 make.info-2)
 
 post_install() {
@@ -18,3 +18,4 @@ pre_remove() {
     install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
+