diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn
index e6e8b53..65f9d22 100644
--- a/library/SIP_Templates.ttcn
+++ b/library/SIP_Templates.ttcn
@@ -218,6 +218,16 @@
 	optionsTags := optionsTags
 }
 
+// [20.35 RFC2616 14.38]
+template (value) Server ts_Server(template (value) ServerVal_List serverBody := {}) := {
+	fieldName := SERVER_E,
+	serverBody := serverBody
+}
+template (present) Server tr_Server(template (present) ServerVal_List serverBody := ?) := {
+	fieldName := SERVER_E,
+	serverBody := serverBody
+}
+
 // [20.37]
 template (value) Supported ts_Supported(template (value) OptionTag_List optionsTags := {}) := {
 	fieldName := SUPPORTED_E,
@@ -536,6 +546,7 @@
 		template (omit) Require require := omit,
 		template (omit) Security_client security_client := omit,
 		template (omit) Security_server security_server := omit,
+		template (omit) Server server := omit,
 		template (omit) Supported supported := omit,
 		template (omit) UserAgent userAgent := ts_UserAgent({ "osmo-ttcn3-hacks/0.23" }),
 		template (omit) WwwAuthenticate wwwAuthenticate := omit
@@ -562,6 +573,7 @@
 	require := require,
 	security_client := security_client,
 	security_server := security_server,
+	server := server,
 	supported := supported,
 	toField := {
 		fieldName := TO_E,
@@ -587,6 +599,7 @@
 		template Require require := *,
 		template Security_client security_client := *,
 		template Security_server security_server := *,
+		template Server server := *,
 		template Supported supported := *,
 		template UserAgent userAgent := *,
 		template WwwAuthenticate wwwAuthenticate := *
@@ -612,6 +625,7 @@
 	require := require,
 	security_client := security_client,
 	security_server := security_server,
+	server := server,
 	supported := supported,
 	toField := {
 		fieldName := TO_E,