diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 2e15500df43..84300b78a10 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-28  Jonas Hahnfeld  <Hahnfeld@itc.rwth-aachen.de>
+
+	* config/linux/affinity.c [!HAVE_PTHREAD_AFFINITY_NP]: Include
+	../../affinity.c as fallback.
+	* config/nvptx/affinity.c: Delete to use fallback implementation.
+
 2016-11-23  Alexander Monakov  <amonakov@ispras.ru>
             Jakub Jelinek  <jakub@redhat.com>
 	    Dmitry Melnik  <dm@ispras.ru>
diff --git a/libgomp/config/linux/affinity.c b/libgomp/config/linux/affinity.c
index ca6eec046c6..d8dede607a1 100644
--- a/libgomp/config/linux/affinity.c
+++ b/libgomp/config/linux/affinity.c
@@ -394,6 +394,6 @@ ialias(omp_get_place_proc_ids)
 
 #else
 
-#include "../posix/affinity.c"
+#include "../../affinity.c"
 
 #endif
diff --git a/libgomp/config/nvptx/affinity.c b/libgomp/config/nvptx/affinity.c
deleted file mode 100644
index e69de29bb2d..00000000000