diff --git a/srcpkgs/png++-doc b/srcpkgs/png++-doc
new file mode 120000
index 00000000000..763f9bcac6f
--- /dev/null
+++ b/srcpkgs/png++-doc
@@ -0,0 +1 @@
+png++
\ No newline at end of file
diff --git a/srcpkgs/png++/patches/fix-destdir.patch b/srcpkgs/png++/patches/fix-destdir.patch
new file mode 100644
index 00000000000..06827a117e2
--- /dev/null
+++ b/srcpkgs/png++/patches/fix-destdir.patch
@@ -0,0 +1,22 @@
+--- Makefile.orig
++++ Makefile
+@@ -54,8 +54,8 @@
+ uninstall: uninstall-headers uninstall-docs
+ 
+ install-headers:
+-	mkdir -p $(PREFIX)/include/png++
+-	cp $(headers) $(PREFIX)/include/png++
++	mkdir -p $(DESTDIR)/$(PREFIX)/include/png++
++	cp $(headers) $(DESTDIR)/$(PREFIX)/include/png++
+ 
+ uninstall-headers:
+ 	rm -rf $(PREFIX)/include/png++
+@@ -103,7 +103,7 @@
+ 
+ install-docs:
+ 	if [ -d doc ]; then \
+-		dir=$(PREFIX)/share/doc/$(dist_dir); \
++		dir=$(DESTDIR)/$(PREFIX)/share/doc/$(dist_dir); \
+ 		rm -rf $$dir; \
+ 		mkdir -p $$dir \
+ 		&& cp -r $(doc_files) doc/html $$dir; \
diff --git a/srcpkgs/png++/patches/musl-config.patch b/srcpkgs/png++/patches/musl-config.patch
new file mode 100644
index 00000000000..b12a8aca605
--- /dev/null
+++ b/srcpkgs/png++/patches/musl-config.patch
@@ -0,0 +1,10 @@
+--- config.hpp	2015-10-25 20:42:45.000000000 +0100
++++ config.hpp	2018-11-07 12:52:38.903453133 +0100
+@@ -34,7 +34,7 @@
+ #include <stdlib.h>
+ 
+ // Endianness test
+-#if defined(__GLIBC__)
++#if defined(__linux__)
+ 
+ #include <endian.h>
diff --git a/srcpkgs/png++/patches/musl-error.patch b/srcpkgs/png++/patches/musl-error.patch
new file mode 100644
index 00000000000..f1123d938ee
--- /dev/null
+++ b/srcpkgs/png++/patches/musl-error.patch
@@ -0,0 +1,11 @@
+--- error.hpp	2015-10-25 20:42:45.000000000 +0100
++++ -	2018-11-07 12:49:36.093450988 +0100
+@@ -100,7 +100,7 @@
+             strerror_s(buf, ERRBUF_SIZE, errnum);
+             return std::string(buf);
+ #else
+-#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE
++#if ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE) || !defined(__GLIBC__)
+             strerror_r(errnum, buf, ERRBUF_SIZE);
+             return std::string(buf);
+ #else
diff --git a/srcpkgs/png++/template b/srcpkgs/png++/template
new file mode 100644
index 00000000000..99de7397893
--- /dev/null
+++ b/srcpkgs/png++/template
@@ -0,0 +1,27 @@
+# Template file for 'png++'
+pkgname=png++
+version=0.2.9
+revision=1
+build_style=gnu-makefile
+make_build_target="docs"
+make_use_env=yes
+hostmakedepends="doxygen"
+depends="libpng-devel"
+short_desc="C++ wrapper for libpng library"
+maintainer="Alex Childs <misuchiru03+void@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.nongnu.org/pngpp"
+distfiles="${NONGNU_SITE}/pngpp/${pkgname}-${version}.tar.gz"
+checksum=abbc6a0565122b6c402d61743451830b4faee6ece454601c5711e1c1b4238791
+
+post_install() {
+	vlicense COPYING
+}
+
+png++-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}"
+	pkg_install() {
+		vmove usr/share
+	}
+}