diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index c392c57fcac..895d3bd6db2 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-24  Maxim Ostapenko  <m.ostapenko@partner.samsung.com>
+
+	* include/system/linux/asm/ptrace.h: Move to ...
+	* include/system/asm/ptrace.h: ... this.
+
 2015-11-24  Maxim Ostapenko  <m.ostapenko@partner.samsung.com>
 
 	* include/system/linux/asm/ptrace.h: New header.
diff --git a/libsanitizer/include/system/linux/asm/ptrace.h b/libsanitizer/include/system/asm/ptrace.h
similarity index 88%
rename from libsanitizer/include/system/linux/asm/ptrace.h
rename to libsanitizer/include/system/asm/ptrace.h
index d4249fee960..5d2fe9becf0 100644
--- a/libsanitizer/include/system/linux/asm/ptrace.h
+++ b/libsanitizer/include/system/asm/ptrace.h
@@ -1,4 +1,4 @@
-#include_next <linux/asm/ptrace.h>
+#include_next <asm/ptrace.h>
 /* ARM_VFPREGS_SIZE has been added in 3.0 */
 #if defined(__arm__) && !defined(ARM_VFPREGS_SIZE)
 /* The size of the user-visible VFP state as seen by PTRACE_GET/SETVFPREGS