diff --git a/ChangeLog b/ChangeLog
index df04a89..620b6b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ unreleased chanes
 	- Specify source per server
 	- User configurable cipher-list and ciphersuites
 	- User configurable TLS versions
+	- Config option for DH-file
 
 	Misc:
 	- Move radsecproxy manpage to section 8
diff --git a/radsecproxy.conf.5.in b/radsecproxy.conf.5.in
index a2ce537..febc21d 100644
--- a/radsecproxy.conf.5.in
+++ b/radsecproxy.conf.5.in
@@ -830,7 +830,11 @@ Currently supported values are
 for TLS and
 .BR DTLS1 , DTLS1_1
 for DTLS.
+.RE
 
+.BI "DhFile " file
+.RS
+DH parameter \fIfile\fR to use. See \fBopenssl-dhparam\fR(1)
 
 
 .SH "REWRITE BLOCK"
diff --git a/tlscommon.c b/tlscommon.c
index 618b6a2..cbfe12c 100644
--- a/tlscommon.c
+++ b/tlscommon.c
@@ -449,6 +449,14 @@ static SSL_CTX *tlscreatectx(uint8_t type, struct tls *conf) {
         }
     }
 #endif
+
+    if (conf->dhparam) {
+        if (!SSL_CTX_set_tmp_dh(ctx, conf->dhparam)) {
+            while ((error = ERR_get_error()))
+                debug(DBG_WARN, "tlscreatectx: SSL: %s", ERR_error_string(error, NULL));
+            debug(DBG_WARN, "tlscreatectx: Failed to set dh params. Can continue, but some ciphers might not be available.");
+        }
+    }
     debug(DBG_DBG, "tlscreatectx: created TLS context %s", conf->name);
     return ctx;
 }
@@ -823,6 +831,8 @@ int conftls_cb(struct gconffile **cf, void *arg, char *block, char *opt, char *v
     long int expiry = LONG_MIN;
     char *tlsversion = NULL;
     char *dtlsversion = NULL;
+    char *dhfile = NULL;
+    unsigned long error;
 
     debug(DBG_DBG, "conftls_cb called for %s", block);
 
@@ -846,6 +856,7 @@ int conftls_cb(struct gconffile **cf, void *arg, char *block, char *opt, char *v
               "CipherSuites", CONF_STR, &conf->ciphersuites,
               "TlsVersion", CONF_STR, &tlsversion,
               "DtlsVersion", CONF_STR, &dtlsversion,
+              "DhFile", CONF_STR, &dhfile,
 			  NULL
 	    )) {
 	debug(DBG_ERR, "conftls_cb: configuration error in block %s", val);
@@ -889,6 +900,25 @@ int conftls_cb(struct gconffile **cf, void *arg, char *block, char *opt, char *v
         goto errexit;
 #endif
 
+    if (dhfile) {
+        FILE *dhfp = fopen(dhfile, "r");
+        if (dhfp) {
+            conf->dhparam = PEM_read_DHparams(dhfp, NULL, NULL, NULL);
+            fclose(dhfp);
+            if (!conf->dhparam) {
+                while ((error = ERR_get_error()))
+                    debug(DBG_ERR, "SSL: %s", ERR_error_string(error, NULL));
+                debug(DBG_ERR, "error in block %s: Failed to load DhFile %s.", val, dhfile);
+                goto errexit;
+            }
+        } else {
+            debug(DBG_ERR, "error in block %s, DhFile: can't open file %s", val, dhfile);
+            goto errexit;
+        }
+        free(dhfile);
+        dhfile = NULL;
+    }
+
     conf->name = stringcopy(val, 0);
     if (!conf->name) {
 	debug(DBG_ERR, "conftls_cb: malloc failed");
@@ -916,6 +946,8 @@ int conftls_cb(struct gconffile **cf, void *arg, char *block, char *opt, char *v
     freegconfmstr(conf->policyoids);
     free(tlsversion);
     free(dtlsversion);
+    free(dhfile);
+    DH_free(conf->dhparam);
     free(conf);
     return 0;
 }
diff --git a/tlscommon.h b/tlscommon.h
index 5e0562d..3cccf65 100644
--- a/tlscommon.h
+++ b/tlscommon.h
@@ -25,6 +25,7 @@ struct tls {
     int tlsmaxversion;
     int dtlsminversion;
     int dtlsmaxversion;
+    DH *dhparam;
     uint32_t tlsexpiry;
     uint32_t dtlsexpiry;
     X509_VERIFY_PARAM *vpm;