--- a/Makefile.inc.in
+++ b/Makefile.inc.in
@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
 HAVE_PORTAUDIO  = @with_portaudio@
 HAVE_FFMS2      = @with_ffms2@
 HAVE_LIBPULSE   = @with_libpulse@
+HAVE_LIBATOMIC  = @with_libatomic@
 
 ##############
 # BUILD OUTPUT
--- a/configure.ac
+++ b/configure.ac
@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
 AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
 AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
 
+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
+AC_SUBST(with_libatomic)
+
 ######################################################
 # Debugging support
 ######################################################
--- a/src/Makefile
+++ b/src/Makefile
@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
 src_OBJ += $(d)spellchecker_hunspell.o
 endif
 
+ifeq (yes, $(HAVE_LIBATOMIC))
+src_LIBS += -latomic
+endif
+
 #####################
 # SOURCE-LEVEL CFLAGS
 #####################