diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile
index 87af4ea9a46..7679c8750f7 100644
--- a/sysutils/smartmontools/Makefile
+++ b/sysutils/smartmontools/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.26 2015/05/18 17:17:40 giovanni Exp $
+# $OpenBSD: Makefile,v 1.27 2015/09/22 22:21:10 giovanni Exp $
 
 ONLY_FOR_ARCHS=		amd64 i386 powerpc
 
 COMMENT=		control and monitor storage systems using SMART
 
-DISTNAME=		smartmontools-6.3
+DISTNAME=		smartmontools-6.4
 CATEGORIES=		sysutils
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=smartmontools/}
@@ -18,7 +18,7 @@ CONFIGURE_STYLE=       	gnu
 CONFIGURE_ARGS=	--with-docdir=${PREFIX}/share/doc/smartmontools \
 			--with-exampledir=${PREFIX}/share/examples/smartmontools \
 			--with-libcap-ng=no \
-			--disable-drivedb
+			--without-drivedbdir
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/sysutils/smartmontools/distinfo b/sysutils/smartmontools/distinfo
index 7796f89039e..58e056f2277 100644
--- a/sysutils/smartmontools/distinfo
+++ b/sysutils/smartmontools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (smartmontools-6.3.tar.gz) = p3cGXRpZZdcbNnLgVLCbdpYgDsc6r0WrY280AWU4/hk=
-SIZE (smartmontools-6.3.tar.gz) = 809790
+SHA256 (smartmontools-6.4.tar.gz) = 6rdWAMHtqcNLEwl9txE4qzdvPa2KakZn+00dCB/reoU=
+SIZE (smartmontools-6.4.tar.gz) = 822539
diff --git a/sysutils/smartmontools/patches/patch-Makefile_in b/sysutils/smartmontools/patches/patch-Makefile_in
index a493b004023..bbdd70158df 100644
--- a/sysutils/smartmontools/patches/patch-Makefile_in
+++ b/sysutils/smartmontools/patches/patch-Makefile_in
@@ -1,7 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.10 2015/05/18 17:17:40 giovanni Exp $
---- Makefile.in.orig	Sat Jul 26 11:50:18 2014
-+++ Makefile.in	Sat May 16 09:11:39 2015
-@@ -338,8 +338,8 @@ man5dir = $(mandir)/man5
+--- Makefile.in.orig    2015-09-22 14:43:49.000000000 -0500
++++ Makefile.in 2015-09-22 14:45:08.000000000 -0500
+@@ -345,8 +345,8 @@
  man8dir = $(mandir)/man8
  NROFF = nroff
  MANS = $(man_MANS)
@@ -10,11 +9,11 @@ $OpenBSD: patch-Makefile_in,v 1.10 2015/05/18 17:17:40 giovanni Exp $
 +DATA = $(docs_DATA) $(drivedb_DATA) $(examples_DATA) \
 +	$(systemdsystemunit_DATA)
  am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
- 	$(LISP)config.h.in
+        $(LISP)config.h.in
  # Read a list of newline-separated strings from the standard input,
-@@ -576,17 +576,7 @@ EXTRA_smartd_SOURCES = os_darwin.cpp os_darwin.h os_li
+@@ -587,16 +587,7 @@
  @OS_SOLARIS_FALSE@man_MANS = smartd.conf.5 smartctl.8 smartd.8 \
- @OS_SOLARIS_FALSE@	$(am__append_23)
+ @OS_SOLARIS_FALSE@     $(am__append_23)
  docsdir = $(docdir)
 -docs_DATA = \
 -        AUTHORS \
@@ -25,20 +24,19 @@ $OpenBSD: patch-Makefile_in,v 1.10 2015/05/18 17:17:40 giovanni Exp $
 -        NEWS \
 -        README \
 -        TODO \
--        WARNINGS \
 -        smartd.conf
 +docs_DATA = smartd.conf
- 
+
  examplesdir = $(exampledir)
  examples_DATA = \
-@@ -598,10 +588,11 @@ examples_SCRIPTS = \
+@@ -608,10 +599,11 @@
          examplescripts/Example3 \
          examplescripts/Example4 \
          examplescripts/Example5 \
 -        examplescripts/Example6
 +        examplescripts/Example6 \
-+	smartd_warning.sh
- 
++        smartd_warning.sh
+
  sysconf_DATA = smartd.conf
 -smartdscript_SCRIPTS = smartd_warning.sh
 +smartdscript_SCRIPTS =