diff --git a/devel/libdwarf/Makefile b/devel/libdwarf/Makefile
new file mode 100644
index 00000000000..d6a3a7c6910
--- /dev/null
+++ b/devel/libdwarf/Makefile
@@ -0,0 +1,47 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2016/03/26 12:53:30 ajacoutot Exp $
+
+COMMENT=		library to access the DWARF debugging file format
+
+V=			20160115
+DISTNAME=		libdwarf-${V}
+WRKDIST=		${WRKDIR}/dwarf-${V}
+
+SHARED_LIBS=		dwarf 0.0
+
+CATEGORIES=		devel
+
+HOMEPAGE=		https://www.prevanders.net/dwarf.html
+
+# GPLv2 - LGPLv2.1
+PERMIT_PACKAGE_CDROM=	Yes
+
+WANTLIB += c elf z
+
+MASTER_SITES=		https://www.prevanders.net/
+
+LIB_DEPENDS=		devel/libelf
+
+NO_TEST=		Yes
+
+FLAGS=			$$(pkg-config --cflags libelf)
+CFLAGS=			${FLAGS}
+CXXFLAGS=		${FLAGS}
+
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ENV=		CPPFLAGS="${FLAGS}" \
+			LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=		--enable-shared
+
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/libdwarf/Makefile.in
+
+do-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/include/libdwarf
+	${INSTALL_DATA} ${WRKBUILD}/libdwarf/{,lib}dwarf.h \
+		${PREFIX}/include/libdwarf/
+	${INSTALL_DATA} ${WRKBUILD}/libdwarf/libdwarf.{a,so.${LIBdwarf_VERSION}} \
+		${PREFIX}/lib/
+	${INSTALL_PROGRAM} ${WRKBUILD}/dwarfdump/dwarfdump \
+		${PREFIX}/bin/
+
+.include <bsd.port.mk>
diff --git a/devel/libdwarf/distinfo b/devel/libdwarf/distinfo
new file mode 100644
index 00000000000..be09cc02721
--- /dev/null
+++ b/devel/libdwarf/distinfo
@@ -0,0 +1,2 @@
+SHA256 (libdwarf-20160115.tar.gz) = 6NrzAxgZU3UfCkdhtrBaI46AJjXgjX/IN+RG4mshLzM=
+SIZE (libdwarf-20160115.tar.gz) = 1538930
diff --git a/devel/libdwarf/patches/patch-libdwarf_Makefile_in b/devel/libdwarf/patches/patch-libdwarf_Makefile_in
new file mode 100644
index 00000000000..1661b5ca620
--- /dev/null
+++ b/devel/libdwarf/patches/patch-libdwarf_Makefile_in
@@ -0,0 +1,18 @@
+$OpenBSD: patch-libdwarf_Makefile_in,v 1.1.1.1 2016/03/26 12:53:31 ajacoutot Exp $
+--- libdwarf/Makefile.in.orig	Sat Mar 26 13:42:10 2016
++++ libdwarf/Makefile.in	Sat Mar 26 13:43:05 2016
+@@ -123,12 +123,12 @@ OBJS= dwarf_abbrev.o \
+         pro_weaks.o
+         
+ 
+-all: @build_shared@ @build_nonshared@
++all: libdwarf.so.${LIBdwarf_VERSION} @build_nonshared@
+ 
+ libdwarf.a: dwarf_names.h dwarf_names.c  $(OBJS) dwarf_names.o
+ 	$(AR) $(ARFLAGS) $@ $(OBJS)  dwarf_names.o > ar-output-temp
+ 
+-libdwarf.so: dwarf_names.h dwarf_names.c $(OBJS) dwarf_names.o
++libdwarf.so.${LIBdwarf_VERSION}: dwarf_names.h dwarf_names.c $(OBJS) dwarf_names.o
+ 	$(CC) $(CFLAGS) -shared $(OBJS)  dwarf_names.o $(dwfzlib) -o $@
+ 
+ none:
diff --git a/devel/libdwarf/pkg/DESCR b/devel/libdwarf/pkg/DESCR
new file mode 100644
index 00000000000..78bb5d72391
--- /dev/null
+++ b/devel/libdwarf/pkg/DESCR
@@ -0,0 +1,3 @@
+Library to access the DWARF debugging file format which supports source level
+debugging of a number of procedural languages, such as C, C++, and Fortran.
+See http://www.dwarfstd.org for DWARF specification.
diff --git a/devel/libdwarf/pkg/PLIST b/devel/libdwarf/pkg/PLIST
new file mode 100644
index 00000000000..6cbe31669c4
--- /dev/null
+++ b/devel/libdwarf/pkg/PLIST
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2016/03/26 12:53:31 ajacoutot Exp $
+@bin bin/dwarfdump
+include/libdwarf/
+include/libdwarf/dwarf.h
+include/libdwarf/libdwarf.h
+lib/libdwarf.a
+@lib lib/libdwarf.so.${LIBdwarf_VERSION}