diff --git a/ChangeLog b/ChangeLog
index e2d86f36..8023dfce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-09-02  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	Submitted by Robert Niemi:
+	bug #35800: Compilation error on certain systems if parport is disabled
+	* linux_ppdev.h: Conditionalize inclusion of <linux/parport.h> and
+	<linux/ppdev.h> on HAVE_PARPORT
+
 2013-09-02  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	bug #39794: warnings when building avrdude 6.0rc1 under CentOS 6.4
diff --git a/NEWS b/NEWS
index e3c65155..f5fe1691 100644
--- a/NEWS
+++ b/NEWS
@@ -85,6 +85,7 @@ Current:
       - bug #38023: avrdude doesn't return an error code when attempting
         to upload an invalid Intel HEX file
       - bug #39794: warnings when building avrdude 6.0rc1 under CentOS 6.4
+      - bug #35800: Compilation error on certain systems if parport is disabled
 
   * Keep track of input file contents
 
diff --git a/linux_ppdev.h b/linux_ppdev.h
index 630c7caf..42ff747a 100644
--- a/linux_ppdev.h
+++ b/linux_ppdev.h
@@ -24,8 +24,10 @@
 #define OBSOLETE__IOW _IOW
 
 #include <sys/ioctl.h>
+#ifdef HAVE_PARPORT
 #include <linux/parport.h>
 #include <linux/ppdev.h>
+#endif
 
 #include <stdlib.h>