diff --git a/Makefile.am b/Makefile.am
index 484b4490e..e3369ae4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -493,6 +493,7 @@ AM_CPPFLAGS = \
     -I$(srcdir)/src/sss_client \
     -I$(srcdir)/src \
     -I. \
+    -I/usr/include/nspr \
     $(POPT_CFLAGS) \
     $(TALLOC_CFLAGS) \
     $(TDB_CFLAGS) \
@@ -891,6 +892,7 @@ libsss_child_la_LIBADD = \
     $(TEVENT_LIBS) \
     $(DHASH_LIBS) \
     libsss_debug.la \
+    -lintl \
     $(NULL)
 libsss_child_la_LDFLAGS = -avoid-version
 
@@ -1727,6 +1729,7 @@ sss_signal_SOURCES = \
     $(NULL)
 sss_signal_LDADD = \
     libsss_debug.la \
+    -lintl \
     $(NULL)
 
 sss_override_SOURCES = \
@@ -1885,6 +1888,7 @@ libsss_test_common_la_LIBADD = \
     $(TEVENT_LIBS) \
     $(LDB_LIBS) \
     $(SSSD_INTERNAL_LTLIBS) \
+    -lintl \
     $(NULL)
 
 if HAVE_CHECK
@@ -2604,6 +2608,7 @@ test_authtok_LDADD = \
     $(POPT_LIBS) \
     libsss_test_common.la \
     libsss_debug.la \
+    -lintl \
     $(NULL)
 
 sss_nss_idmap_tests_SOURCES = \
@@ -4276,7 +4281,8 @@ ldap_child_LDADD = \
     $(TALLOC_LIBS) \
     $(POPT_LIBS) \
     $(DHASH_LIBS) \
-    $(KRB5_LIBS)
+    $(KRB5_LIBS) \
+    -lintl
 
 if BUILD_SEMANAGE
 selinux_child_SOURCES = \
@@ -4367,6 +4373,7 @@ p11_child_LDADD = \
     $(DHASH_LIBS) \
     $(POPT_LIBS) \
     libsss_crypt.la \
+    -lintl \
     $(NULL)
 if HAVE_NSS
 p11_child_LDADD += \