diff --git a/common/shlibs b/common/shlibs
index 23aba3ebd62..88d8fd1bf96 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1454,3 +1454,5 @@ libnotmuch.so.3 libnotmuch-0.17_2
 libdri2.so.1 libdri2-0.1_1
 libUMP.so libump-1.0_1
 libUMP.so.3 libump-1.0_1
+libatomic_ops_gpl.so.0 libatomic_ops-7.2e_1
+libatomic_ops.so.0 libatomic_ops-7.2e_1
diff --git a/srcpkgs/libatomic_ops-devel b/srcpkgs/libatomic_ops-devel
new file mode 120000
index 00000000000..0cdfb4f35bd
--- /dev/null
+++ b/srcpkgs/libatomic_ops-devel
@@ -0,0 +1 @@
+libatomic_ops
\ No newline at end of file
diff --git a/srcpkgs/libatomic_ops/template b/srcpkgs/libatomic_ops/template
new file mode 100644
index 00000000000..07e93067d7a
--- /dev/null
+++ b/srcpkgs/libatomic_ops/template
@@ -0,0 +1,33 @@
+# Template file for 'libatomic_ops'
+pkgname=libatomic_ops
+version=7.2e
+revision=1
+wrksrc="${pkgname}-${version/e/}"
+build_style=gnu-configure
+hostmakedepends="automake libtool"
+short_desc="Provides semi-portable access to hardware provided atomic memory operations"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2, MIT"
+homepage="https://github.com/ivmai/libatomic_ops"
+distfiles="http://www.hpl.hp.com/research/linux/atomic_ops/download/${pkgname}-${version}.tar.gz"
+checksum=e524cdb5603a66e28127bbd767cc6840e9854b449f7b3bcf6585e0f1391e757b
+
+pre_configure() {
+	sed -i 's#AM_CONFIG_HEADER#AC_CONFIG_HEADERS#' configure.ac
+	sed -i 's#AC_PROG_RANLIB#AC_LIBTOOL_DLOPEN\nAC_PROG_LIBTOOL#' configure.ac
+	sed -i 's#b_L#b_LTL#;s#\.a#.la#g;s#_a_#_la_#' src/Makefile.am
+	sed -i 's#\.a#.so#g;s#\.\./src/#../src/.libs/#g' tests/Makefile.am
+	sed -i 's#pkgdata#doc#' doc/Makefile.am
+	autoreconf -fi
+}
+
+libatomic_ops-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}