--- a/Makefile.in
+++ b/Makefile.in
@@ -58,25 +58,25 @@ libiberty.stmp:
 	cd libiberty/ && $(MAKE)
 	: > $@
 
-nvptx-none-as: $(srcdir)/nvptx-as.cc libiberty.stmp $(srcdir)/version.h
-	$(CXX) $(CPPFLAGS_ALL) $(CXXFLAGS_ALL) -I$(srcdir)/include \
+nvptx-none-as: $(srcdir)/nvptx-as.cc $(srcdir)/version.h
+	$(CXX) $(CPPFLAGS_ALL) $(CXXFLAGS_ALL) -I/usr/include/libiberty -I$(srcdir)/include \
 		$< -o $@ \
-		-Llibiberty -liberty $(LDFLAGS) $(LIBS)
+		-liberty $(LDFLAGS) $(LIBS)
 
-nvptx-none-ld: $(srcdir)/nvptx-ld.cc libiberty.stmp $(srcdir)/version.h
-	$(CXX) $(CPPFLAGS_ALL) $(CXXFLAGS_ALL) -I$(srcdir)/include \
+nvptx-none-ld: $(srcdir)/nvptx-ld.cc $(srcdir)/version.h
+	$(CXX) $(CPPFLAGS_ALL) $(CXXFLAGS_ALL) -I/usr/include/libiberty -I$(srcdir)/include \
 		$< -o $@ \
-		-Llibiberty -liberty $(LDFLAGS) $(LIBS)
+		-liberty $(LDFLAGS) $(LIBS)
 
-nvptx-none-nm: $(srcdir)/nvptx-nm.cc libiberty.stmp $(srcdir)/version.h
-	$(CXX) $(CPPFLAGS_ALL) $(CXXFLAGS_ALL) -I$(srcdir)/include \
+nvptx-none-nm: $(srcdir)/nvptx-nm.cc $(srcdir)/version.h
+	$(CXX) $(CPPFLAGS_ALL) $(CXXFLAGS_ALL) -I/usr/include/libiberty -I$(srcdir)/include \
 		$< -o $@ \
-		-Llibiberty -liberty $(LDFLAGS) $(LIBS)
+		-liberty $(LDFLAGS) $(LIBS)
 
-nvptx-none-run: $(srcdir)/nvptx-run.cc libiberty.stmp $(srcdir)/version.h
-	$(CXX) $(CPPFLAGS_ALL) $(CXXFLAGS_ALL) -I$(srcdir)/include \
+nvptx-none-run: $(srcdir)/nvptx-run.cc $(srcdir)/version.h
+	$(CXX) $(CPPFLAGS_ALL) $(CXXFLAGS_ALL) -I/usr/include/libiberty -I$(srcdir)/include \
 		$< -o $@ \
-		-Llibiberty -liberty $(LDFLAGS) $(LIBS) \
+		-liberty $(LDFLAGS) $(LIBS) \
 		$(NVPTX_RUN_CPPFLAGS) $(NVPTX_RUN_LDFLAGS)
 
 
@@ -85,13 +85,6 @@ nvptx-none-run: $(srcdir)/nvptx-run.cc l
 .PHONY: check
 check:
 
-# libiberty
-
-check: check-libiberty
-.PHONY: check-libiberty
-check-libiberty: libiberty.stmp
-	cd libiberty/testsuite/ && $(MAKE) check
-
 # lit
 
 # Unless 'make' has been invoked in parallel mode ('-jN'), don't run lit in