diff --git a/devel/acpica/Makefile b/devel/acpica/Makefile
index d34e2cab41b..e05942e5947 100644
--- a/devel/acpica/Makefile
+++ b/devel/acpica/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2014/05/20 16:37:08 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2014/05/20 17:02:30 sthen Exp $
 
 ONLY_FOR_ARCHS =	amd64 i386
 
 COMMENT =		reference implementation of ACPI tools
-V =			20121018
-DISTNAME =		acpica-unix2-$V
-PKGNAME =		acpica-$V
+DISTNAME =		acpica-unix2-20140424
+PKGNAME =		${DISTNAME:S/-unix2//}
 CATEGORIES =		devel
 
 HOMEPAGE =		https://acpica.org/
@@ -17,24 +16,10 @@ WANTLIB =		c pthread
 PERMIT_PACKAGE_CDROM =	Yes
 
 USE_GMAKE =		Yes
-BUILD_DEPENDS =		devel/flex devel/bison
-
-do-build:
-	cd ${WRKSRC}/source/compiler && env CFLAGS="${CFLAGS}" ${MAKE_PROGRAM}
-.for i in acpisrc acpinames acpixtract
-	cd ${WRKSRC}/source/tools/$i && env CFLAGS="${CFLAGS}" ${MAKE_PROGRAM}
-.endfor
-	cd ${WRKSRC}/source/tools/acpiexec && \
-	    env CFLAGS="${CFLAGS}" ${MAKE_PROGRAM} clean acpiexec
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/source/compiler/iasl ${PREFIX}/bin/
-.for i in acpisrc acpinames acpixtract acpiexec
-	${INSTALL_PROGRAM} ${WRKSRC}/source/tools/$i/$i ${PREFIX}/bin/
-.endfor
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/acpica/
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/acpica/
-	${INSTALL_DATA} ${FILESDIR}/LICENSE ${PREFIX}/share/doc/acpica/
+BUILD_DEPENDS =		devel/bison \
+			devel/flex
+MAKE_FLAGS =		CC="${CC}" NOOPT=true
+FAKE_FLAGS =		DESTDIR=
 
 do-test:
 	cd ${WRKSRC}/tests/templates && sh templates.sh 1
diff --git a/devel/acpica/distinfo b/devel/acpica/distinfo
index 9fb7487e264..67732a58422 100644
--- a/devel/acpica/distinfo
+++ b/devel/acpica/distinfo
@@ -1,2 +1,2 @@
-SHA256 (acpica-unix2-20121018.tar.gz) = r7Z+6dqazTXYlIwfJFpZUYLPEmYcPzop1KJR6JVV3/c=
-SIZE (acpica-unix2-20121018.tar.gz) = 1162324
+SHA256 (acpica-unix2-20140424.tar.gz) = cuzpgru9+xsXQY8f6zqdqqAYA9DUHc8A4Z1wLN91G7w=
+SIZE (acpica-unix2-20140424.tar.gz) = 1272950
diff --git a/devel/acpica/patches/patch-generate_unix_Makefile_config b/devel/acpica/patches/patch-generate_unix_Makefile_config
index 0f98044cdca..ec6aa858315 100644
--- a/devel/acpica/patches/patch-generate_unix_Makefile_config
+++ b/devel/acpica/patches/patch-generate_unix_Makefile_config
@@ -1,21 +1,36 @@
-$OpenBSD: patch-generate_unix_Makefile_config,v 1.2 2014/05/20 16:37:09 sthen Exp $
---- generate/unix/Makefile.config.orig	Wed Jul 11 11:55:07 2012
-+++ generate/unix/Makefile.config	Fri May  9 02:15:58 2014
-@@ -118,16 +118,10 @@ CWARNINGFLAGS += \
-     -Waddress \
-     -Waggregate-return \
-     -Wchar-subscripts \
--    -Wempty-body \
--    -Wlogical-op \
-     -Wmissing-declarations \
-     -Wmissing-field-initializers \
--    -Wmissing-parameter-type \
-     -Wnested-externs \
--    -Wold-style-declaration \
--    -Wold-style-definition \
--    -Wredundant-decls \
--    -Wtype-limits
-+    -Wold-style-definition
+$OpenBSD: patch-generate_unix_Makefile_config,v 1.3 2014/05/20 17:02:30 sthen Exp $
+--- generate/unix/Makefile.config.orig	Thu Apr 24 16:48:58 2014
++++ generate/unix/Makefile.config	Tue May 20 17:44:50 2014
+@@ -157,7 +157,6 @@ CWARNINGFLAGS = \
+     -Wall\
+     -Wbad-function-cast\
+     -Wdeclaration-after-statement\
+-    -Werror\
+     -Wformat=2\
+     -Wmissing-declarations\
+     -Wmissing-prototypes\
+@@ -180,23 +179,7 @@ CWARNINGFLAGS += \
+     -Wnested-externs\
+     -Wold-style-definition\
+     -Woverride-init\
+-    -Wno-format-nonliteral\
+-    -Wredundant-decls
+-#
+-# Per-host flags and exclusions
+-#
+-ifneq ($(HOST), _FreeBSD)
+-    CWARNINGFLAGS += \
+-        -Wempty-body
+-
+-    ifneq ($(HOST), _APPLE)
+-        CWARNINGFLAGS += \
+-        -Wlogical-op\
+-        -Wmissing-parameter-type\
+-        -Wold-style-declaration\
+-        -Wtype-limits
+-    endif
+-endif
++    -Wno-format-nonliteral
  
  #
- # Extra warning flags (possible future use)
+ # Extra warning flags (for possible future use)
diff --git a/devel/acpica/patches/patch-generate_unix_acpiexec_Makefile b/devel/acpica/patches/patch-generate_unix_acpiexec_Makefile
index 286df88ef14..97cd39588b1 100644
--- a/devel/acpica/patches/patch-generate_unix_acpiexec_Makefile
+++ b/devel/acpica/patches/patch-generate_unix_acpiexec_Makefile
@@ -1,12 +1,14 @@
-$OpenBSD: patch-generate_unix_acpiexec_Makefile,v 1.5 2014/05/20 16:37:09 sthen Exp $
---- generate/unix/acpiexec/Makefile.orig	Wed Jul 11 11:55:07 2012
-+++ generate/unix/acpiexec/Makefile	Fri May  9 02:15:58 2014
-@@ -205,7 +205,7 @@ OBJECTS = \
- CFLAGS+= \
-     -DACPI_EXEC_APP \
-     -I$(ACPIEXEC)
--LDFLAGS += -lpthread -lrt
-+LDFLAGS += -lpthread
+$OpenBSD: patch-generate_unix_acpiexec_Makefile,v 1.6 2014/05/20 17:02:30 sthen Exp $
+--- generate/unix/acpiexec/Makefile.orig	Thu Apr 24 16:48:58 2014
++++ generate/unix/acpiexec/Makefile	Tue May 20 17:40:55 2014
+@@ -235,10 +235,6 @@ endif
  
+ LDFLAGS += -lpthread
+ 
+-ifneq ($(HOST),_APPLE)
+-LDFLAGS += -lrt
+-endif
+-
+ #
+ # Common Rules
  #
- # Rules
diff --git a/devel/acpica/patches/patch-generate_unix_iasl_Makefile b/devel/acpica/patches/patch-generate_unix_iasl_Makefile
deleted file mode 100644
index 04bb759a2b1..00000000000
--- a/devel/acpica/patches/patch-generate_unix_iasl_Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-$OpenBSD: patch-generate_unix_iasl_Makefile,v 1.2 2014/05/20 16:37:09 sthen Exp $
---- generate/unix/iasl/Makefile.orig	Wed Jul 11 11:55:07 2012
-+++ generate/unix/iasl/Makefile	Fri May  9 02:15:58 2014
-@@ -242,15 +242,15 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prparserparse.h : 
- 
- $(OBJDIR)/aslcompiler.y.h : $(OBJDIR)/aslcompilerparse.h
- 	@echo Copy intermediate file:
--	@cp -f -v $(OBJDIR)/aslcompilerparse.h $(OBJDIR)/aslcompiler.y.h
-+	@cp -f $(OBJDIR)/aslcompilerparse.h $(OBJDIR)/aslcompiler.y.h
- 
- $(OBJDIR)/dtparser.y.h: $(OBJDIR)/dtparserparse.h
- 	@echo Copy intermediate file:
--	@cp -f -v $(OBJDIR)/dtparserparse.h $(OBJDIR)/dtparser.y.h
-+	@cp -f $(OBJDIR)/dtparserparse.h $(OBJDIR)/dtparser.y.h
- 
- $(OBJDIR)/prparser.y.h: $(OBJDIR)/prparserparse.h
- 	@echo Copy intermediate file:
--	@cp -f -v $(OBJDIR)/prparserparse.h $(OBJDIR)/prparser.y.h
-+	@cp -f $(OBJDIR)/prparserparse.h $(OBJDIR)/prparser.y.h
- 
- 
- #
diff --git a/devel/acpica/patches/patch-source_compiler_Makefile b/devel/acpica/patches/patch-source_compiler_Makefile
deleted file mode 100644
index df14ffa8316..00000000000
--- a/devel/acpica/patches/patch-source_compiler_Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-$OpenBSD: patch-source_compiler_Makefile,v 1.1 2014/05/20 16:37:09 sthen Exp $
---- source/compiler/Makefile.orig	Wed Jul 11 11:55:10 2012
-+++ source/compiler/Makefile	Fri May  9 02:15:58 2014
-@@ -262,16 +262,10 @@ CWARNINGFLAGS += \
-     -Waddress \
-     -Waggregate-return \
-     -Wchar-subscripts \
--    -Wempty-body \
--    -Wlogical-op \
-     -Wmissing-declarations \
-     -Wmissing-field-initializers \
--    -Wmissing-parameter-type \
-     -Wnested-externs \
--    -Wold-style-declaration \
--    -Wold-style-definition \
--    -Wredundant-decls \
--    -Wtype-limits
-+    -Wold-style-definition
- 
- #
- # Bison/Flex configuration
-@@ -314,15 +308,15 @@ prparserparse.c prparserparse.h : $(ASL_COMPILER)/prpa
- 
- aslcompiler.y.h : aslcompilerparse.h
- 	@echo Copy intermediate file:
--	@cp -f -v aslcompilerparse.h aslcompiler.y.h
-+	@cp -f aslcompilerparse.h aslcompiler.y.h
- 
- dtparser.y.h: dtparserparse.h
- 	@echo Copy intermediate file:
--	@cp -f -v dtparserparse.h dtparser.y.h
-+	@cp -f dtparserparse.h dtparser.y.h
- 
- prparser.y.h: prparserparse.h
- 	@echo Copy intermediate file:
--	@cp -f -v prparserparse.h prparser.y.h
-+	@cp -f prparserparse.h prparser.y.h
- 
- 
- #
diff --git a/devel/acpica/patches/patch-source_tools_acpibin_Makefile b/devel/acpica/patches/patch-source_tools_acpibin_Makefile
deleted file mode 100644
index c8550dbadd4..00000000000
--- a/devel/acpica/patches/patch-source_tools_acpibin_Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-source_tools_acpibin_Makefile,v 1.1 2014/05/20 16:37:09 sthen Exp $
---- source/tools/acpibin/Makefile.orig	Wed Jul 11 11:55:17 2012
-+++ source/tools/acpibin/Makefile	Fri May  9 02:15:58 2014
-@@ -103,16 +103,10 @@ CWARNINGFLAGS += \
-     -Waddress \
-     -Waggregate-return \
-     -Wchar-subscripts \
--    -Wempty-body \
--    -Wlogical-op \
-     -Wmissing-declarations \
-     -Wmissing-field-initializers \
--    -Wmissing-parameter-type \
-     -Wnested-externs \
--    -Wold-style-declaration \
--    -Wold-style-definition \
--    -Wredundant-decls \
--    -Wtype-limits
-+    -Wold-style-definition
- 
- #
- # Rules
diff --git a/devel/acpica/patches/patch-source_tools_acpiexec_Makefile b/devel/acpica/patches/patch-source_tools_acpiexec_Makefile
deleted file mode 100644
index 79d529ff9fb..00000000000
--- a/devel/acpica/patches/patch-source_tools_acpiexec_Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-source_tools_acpiexec_Makefile,v 1.1 2014/05/20 16:37:09 sthen Exp $
---- source/tools/acpiexec/Makefile.orig	Wed Jul 11 11:55:17 2012
-+++ source/tools/acpiexec/Makefile	Fri May  9 02:15:58 2014
-@@ -21,7 +21,7 @@ PROG = acpiexec
- HOST =          _LINUX
- NOMAN =         YES
- COMPILE =       $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $<
--LDFLAGS +=      -lpthread -lrt
-+LDFLAGS +=      -pthread
- 
- ACPICA_SRC =            ../../../source
- ACPICA_COMMON =         $(ACPICA_SRC)/common
-@@ -260,16 +260,10 @@ CWARNINGFLAGS += \
-     -Waddress \
-     -Waggregate-return \
-     -Wchar-subscripts \
--    -Wempty-body \
--    -Wlogical-op \
-     -Wmissing-declarations \
-     -Wmissing-field-initializers \
--    -Wmissing-parameter-type \
-     -Wnested-externs \
--    -Wold-style-declaration \
--    -Wold-style-definition \
--    -Wredundant-decls \
--    -Wtype-limits
-+    -Wold-style-definition
- 
- #
- # Rules
diff --git a/devel/acpica/patches/patch-source_tools_acpihelp_Makefile b/devel/acpica/patches/patch-source_tools_acpihelp_Makefile
deleted file mode 100644
index b46605d995a..00000000000
--- a/devel/acpica/patches/patch-source_tools_acpihelp_Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-source_tools_acpihelp_Makefile,v 1.1 2014/05/20 16:37:09 sthen Exp $
---- source/tools/acpihelp/Makefile.orig	Wed Jul 11 11:55:17 2012
-+++ source/tools/acpihelp/Makefile	Fri May  9 02:15:58 2014
-@@ -95,16 +95,10 @@ CWARNINGFLAGS += \
-     -Waddress \
-     -Waggregate-return \
-     -Wchar-subscripts \
--    -Wempty-body \
--    -Wlogical-op \
-     -Wmissing-declarations \
-     -Wmissing-field-initializers \
--    -Wmissing-parameter-type \
-     -Wnested-externs \
--    -Wold-style-declaration \
--    -Wold-style-definition \
--    -Wredundant-decls \
--    -Wtype-limits
-+    -Wold-style-definition
- 
- #
- # Rules
diff --git a/devel/acpica/patches/patch-source_tools_acpinames_Makefile b/devel/acpica/patches/patch-source_tools_acpinames_Makefile
deleted file mode 100644
index 11f81916770..00000000000
--- a/devel/acpica/patches/patch-source_tools_acpinames_Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-source_tools_acpinames_Makefile,v 1.1 2014/05/20 16:37:09 sthen Exp $
---- source/tools/acpinames/Makefile.orig	Wed Jul 11 11:55:17 2012
-+++ source/tools/acpinames/Makefile	Fri May  9 02:15:58 2014
-@@ -163,16 +163,10 @@ CWARNINGFLAGS += \
-     -Waddress \
-     -Waggregate-return \
-     -Wchar-subscripts \
--    -Wempty-body \
--    -Wlogical-op \
-     -Wmissing-declarations \
-     -Wmissing-field-initializers \
--    -Wmissing-parameter-type \
-     -Wnested-externs \
--    -Wold-style-declaration \
--    -Wold-style-definition \
--    -Wredundant-decls \
--    -Wtype-limits
-+    -Wold-style-definition
- 
- #
- # Rules
diff --git a/devel/acpica/patches/patch-source_tools_acpisrc_Makefile b/devel/acpica/patches/patch-source_tools_acpisrc_Makefile
deleted file mode 100644
index 629ec7c8e35..00000000000
--- a/devel/acpica/patches/patch-source_tools_acpisrc_Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-source_tools_acpisrc_Makefile,v 1.1 2014/05/20 16:37:09 sthen Exp $
---- source/tools/acpisrc/Makefile.orig	Wed Feb 15 13:12:00 2012
-+++ source/tools/acpisrc/Makefile	Fri May  9 01:53:47 2014
-@@ -97,16 +97,10 @@ CWARNINGFLAGS += \
-     -Waddress \
-     -Waggregate-return \
-     -Wchar-subscripts \
--    -Wempty-body \
--    -Wlogical-op \
-     -Wmissing-declarations \
-     -Wmissing-field-initializers \
--    -Wmissing-parameter-type \
-     -Wnested-externs \
--    -Wold-style-declaration \
--    -Wold-style-definition \
--    -Wredundant-decls \
--    -Wtype-limits
-+    -Wold-style-definition
- 
- #
- # Rules
diff --git a/devel/acpica/patches/patch-source_tools_acpixtract_Makefile b/devel/acpica/patches/patch-source_tools_acpixtract_Makefile
deleted file mode 100644
index 3238003e79f..00000000000
--- a/devel/acpica/patches/patch-source_tools_acpixtract_Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-source_tools_acpixtract_Makefile,v 1.1 2014/05/20 16:37:09 sthen Exp $
---- source/tools/acpixtract/Makefile.orig	Wed Feb 15 13:12:00 2012
-+++ source/tools/acpixtract/Makefile	Fri May  9 01:53:47 2014
-@@ -88,16 +88,10 @@ CWARNINGFLAGS += \
-     -Waddress \
-     -Waggregate-return \
-     -Wchar-subscripts \
--    -Wempty-body \
--    -Wlogical-op \
-     -Wmissing-declarations \
-     -Wmissing-field-initializers \
--    -Wmissing-parameter-type \
-     -Wnested-externs \
--    -Wold-style-declaration \
--    -Wold-style-definition \
--    -Wredundant-decls \
--    -Wtype-limits
-+    -Wold-style-definition
- 
- #
- # Rules
diff --git a/devel/acpica/pkg/PLIST b/devel/acpica/pkg/PLIST
index 027b836279b..6bfcacfc22a 100644
--- a/devel/acpica/pkg/PLIST
+++ b/devel/acpica/pkg/PLIST
@@ -1,9 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.2 2011/04/05 08:02:25 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.3 2014/05/20 17:02:30 sthen Exp $
+@bin bin/acpibin
+@comment @bin bin/acpidump
+@bin bin/acpiexamples
 @bin bin/acpiexec
+@bin bin/acpihelp
 @bin bin/acpinames
 @bin bin/acpisrc
 @bin bin/acpixtract
 @bin bin/iasl
-share/doc/acpica/
-share/doc/acpica/LICENSE
-share/doc/acpica/README