diff --git a/Makefile b/Makefile
index a5a17d198..204a34f43 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,8 @@ obj-y = $(block-obj-y)
 obj-y += readline.o console.o
 
 obj-y += tcg-runtime.o host-utils.o
-obj-y += irq.o ptimer.o ioport.o
+obj-y += irq.o ioport.o
+obj-$(CONFIG_PTIMER) += ptimer.o
 obj-y += i2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o
 obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o
 obj-y += tmp105.o lm832x.o eeprom93xx.o tsc2005.o
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 9ac6f3189..05b4b14aa 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -5,3 +5,4 @@ CONFIG_USB_OHCI=y
 CONFIG_ISA_MMIO=y
 CONFIG_NAND=y
 CONFIG_ECC=y
+CONFIG_PTIMER=y
diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmmu.mak
index c42997907..87114027e 100644
--- a/default-configs/cris-softmmu.mak
+++ b/default-configs/cris-softmmu.mak
@@ -1,3 +1,4 @@
 # Default configuration for cris-softmmu
 
 CONFIG_NAND=y
+CONFIG_PTIMER=y
diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
index 0faeb2cc7..0a7837502 100644
--- a/default-configs/m68k-softmmu.mak
+++ b/default-configs/m68k-softmmu.mak
@@ -1,3 +1,4 @@
 # Default configuration for m68k-softmmu
 
 CONFIG_GDBSTUB_XML=y
+CONFIG_PTIMER=y
diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak
index c42009d00..c800c1669 100644
--- a/default-configs/microblaze-softmmu.mak
+++ b/default-configs/microblaze-softmmu.mak
@@ -1 +1,3 @@
 # Default configuration for microblaze-softmmu
+
+CONFIG_PTIMER=y
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 9c2445b88..4f912eccd 100644
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -1,3 +1,4 @@
 # Default configuration for sh4-softmmu
 
 CONFIG_USB_OHCI=y
+CONFIG_PTIMER=y
diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
index fa54f1087..93d0c76f2 100644
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -1,3 +1,4 @@
 # Default configuration for sh4eb-softmmu
 
 CONFIG_USB_OHCI=y
+CONFIG_PTIMER=y
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index 7a651373e..ac8e4dec5 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -5,3 +5,4 @@ CONFIG_ECC=y
 CONFIG_ESP=y
 CONFIG_ESCC=y
 CONFIG_M48T59=y
+CONFIG_PTIMER=y
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index a24914143..b4bb0b0f1 100644
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -2,3 +2,4 @@
 
 CONFIG_ISA_MMIO=y
 CONFIG_M48T59=y
+CONFIG_PTIMER=y