diff --git a/lib/perfdata/gelfwriter.ti b/lib/perfdata/gelfwriter.ti
index 5018f705e..a3c49ab79 100644
--- a/lib/perfdata/gelfwriter.ti
+++ b/lib/perfdata/gelfwriter.ti
@@ -30,12 +30,6 @@ class GelfWriter : DynamicObject
 	[config] String port {
 		default {{{ return "12201"; }}}
 	};
-	[config] String host_name_template {
-		default {{{ return "icinga.$host.name$"; }}}
-	};
-	[config] String service_name_template {
-		default {{{ return "icinga.$host.name$.$service.name$"; }}}
-	};
 };
 
 }
diff --git a/lib/perfdata/perfdata-type.conf b/lib/perfdata/perfdata-type.conf
index 011a881c1..d5bdff5b6 100644
--- a/lib/perfdata/perfdata-type.conf
+++ b/lib/perfdata/perfdata-type.conf
@@ -33,3 +33,9 @@
 	%attribute %string "host_name_template",
 	%attribute %string "service_name_template"
 }
+
+%type GelfWriter {
+        %attribute %string "host",
+        %attribute %string "port"
+}
+