diff --git a/lib/icinga/icinga-type.conf b/lib/icinga/icinga-type.conf
index 1ce16bec1..584ac28bb 100644
--- a/lib/icinga/icinga-type.conf
+++ b/lib/icinga/icinga-type.conf
@@ -64,6 +64,7 @@ type Host {
 			%attribute number "notification_interval",
 			%attribute name(TimePeriod) "notification_period",
 
+			%attribute number "enable_flapping",
 			%attribute number "flapping_threshold",
 
 			%attribute array "servicegroups" {
@@ -108,7 +109,8 @@ type Host {
 					},
 
 					%attribute number "notification_type_filter",
-					%attribute number "notification_state_filter"
+					%attribute number "notification_state_filter",
+					%attribute name(TimePeriod) "notification_period"
 				}
 			},
 		}
@@ -137,7 +139,8 @@ type Host {
 			},
 
 			%attribute number "notification_type_filter",
-			%attribute number "notification_state_filter"
+			%attribute number "notification_state_filter",
+			%attribute name(TimePeriod) "notification_period"
 		}
 	},
 
@@ -151,6 +154,7 @@ type Host {
 	%attribute number "notification_interval",
 	%attribute name(TimePeriod) "notification_period",
 
+	%attribute number "enable_flapping",
 	%attribute number "flapping_threshold",
 
 	%attribute number "notification_type_filter",
@@ -217,6 +221,7 @@ type Service {
 	%attribute number "notification_interval",
 	%attribute name(TimePeriod) "notification_period",
 
+	%attribute number "enable_flapping",
 	%attribute number "flapping_threshold",
 
 	%attribute array "hostdependencies" {
@@ -261,7 +266,8 @@ type Service {
 			},
 
 			%attribute number "notification_type_filter",
-			%attribute number "notification_state_filter"
+			%attribute number "notification_state_filter",
+			%attribute name(TimePeriod) "notification_period"
 		}
 	}
 }
@@ -317,7 +323,8 @@ type User {
 
 	%attribute number "enable_notifications",
 	%attribute number "notification_type_filter",
-	%attribute number "notification_state_filter"
+	%attribute number "notification_state_filter",
+	%attribute name(TimePeriod) "notification_period"
 
 }