diff --git a/ChangeLog b/ChangeLog
index 0c9c297b78..a92df7310f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+2016-05-02  Florian Weimer  <fweimer@redhat.com>
+
+	* hesiod/hesiod_p.h (DEF_RHS): Remove.
+	* hesiod/hesiod.c (hesiod_init): Remove code for handling DEF_RHS.
+
 2016-05-02  Florian Weimer  <fweimer@redhat.com>
 
 	* hesiod/hesiod.h: Remove RCS keyword.
 	* hesiod/hesiod_p.h: Likewise.
+
 	* hesiod/hesiod.c: Likewise.
 
 2016-05-01  Arnas Udovičius  <arnas.udovicius@gmail.com>
diff --git a/hesiod/hesiod.c b/hesiod/hesiod.c
index 76b9befde2..1869e528af 100644
--- a/hesiod/hesiod.c
+++ b/hesiod/hesiod.c
@@ -42,7 +42,6 @@
 
 #include "hesiod.h"
 #include "hesiod_p.h"
-#undef DEF_RHS
 
 #define _PATH_HESIOD_CONF "/etc/hesiod.conf"
 
@@ -87,19 +86,7 @@ hesiod_init(void **context) {
 	if (!configname)
 	  configname = _PATH_HESIOD_CONF;
 	if (parse_config_file(ctx, configname) < 0) {
-#ifdef DEF_RHS
-		/*
-		 * Use compiled in defaults.
-		 */
-		ctx->LHS = malloc(strlen(DEF_LHS)+1);
-		ctx->RHS = malloc(strlen(DEF_RHS)+1);
-		if (ctx->LHS == 0 || ctx->RHS == 0)
-			goto cleanup;
-		strcpy(ctx->LHS, DEF_LHS);
-		strcpy(ctx->RHS, DEF_RHS);
-#else
 		goto cleanup;
-#endif
 	}
 	/*
 	 * The default RHS can be overridden by an environment
diff --git a/hesiod/hesiod_p.h b/hesiod/hesiod_p.h
index 7bd291997f..0c00c58538 100644
--- a/hesiod/hesiod_p.h
+++ b/hesiod/hesiod_p.h
@@ -26,7 +26,6 @@
 #ifndef _HESIOD_P_H_INCLUDED
 #define _HESIOD_P_H_INCLUDED
 
-#define DEF_RHS		".Athena.MIT.EDU"	/* Defaults if HESIOD_CONF */
 #define DEF_LHS		".ns"			/*    file is not */
 						/*    present. */
 struct hesiod_p {