diff --git a/programs/ssl/ssl_server.c b/programs/ssl/ssl_server.c
index 070d534..7a543d9 100644
--- a/programs/ssl/ssl_server.c
+++ b/programs/ssl/ssl_server.c
@@ -55,14 +55,6 @@
     "<p>Successful connection using: %s</p>\r\n"
 
 /*
- * Computing a "safe" DH prime can take a very
- * long time. RFC 5114 provides precomputed and standardized
- * values.
- */
-char *my_dhm_P = POLARSSL_DHM_RFC5114_MODP_1024_P;
-char *my_dhm_G = POLARSSL_DHM_RFC5114_MODP_1024_G;
-
-/*
  * Sorted by order of preference
  */
 int my_ciphersuites[] =
@@ -186,13 +178,14 @@
     ssl_context ssl;
     x509_cert srvcert;
     rsa_context rsa;
+#if defined(POLARSSL_SSL_CACHE_C)
+    ssl_cache_context cache;
+#endif
 
     ((void) argc);
     ((void) argv);
 
 #if defined(POLARSSL_SSL_CACHE_C)
-    ssl_cache_context cache;
-
     ssl_cache_init( &cache );
 #endif
 
@@ -294,7 +287,8 @@
     ssl_set_ca_chain( &ssl, srvcert.next, NULL, NULL );
     ssl_set_own_cert( &ssl, &srvcert, &rsa );
 #if defined(POLARSSL_DHM_C)
-    ssl_set_dh_param( &ssl, my_dhm_P, my_dhm_G );
+    ssl_set_dh_param( &ssl, POLARSSL_DHM_RFC5114_MODP_1024_P,
+                            POLARSSL_DHM_RFC5114_MODP_1024_G );
 #endif
 
     printf( " ok\n" );