diff --git a/CHANGES b/CHANGES
index f9ec5773b01b77f74a733f11b13d998dcc0a0a78..4cd84ccc8e75cf639a381bef89b61918e453df80 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
 
  Changes between 0.9.1c and 0.9.2
 
+  *) Make sure `make rehash' target really finds the `openssl' program.
+     [Ralf S. Engelschall, Matthias Loepfe <Matthias.Loepfe@adnovum.ch>]
+
   *) Squeeze another 7% of speed out of MD5 assembler, at least on a P2. I'd
      like to hear about it if this slows down other processors.
      [Ben Laurie]
diff --git a/Makefile.org b/Makefile.org
index aad83d43ed2356b65af356d0a165e5559ddb7817..ed0fc7a552d7582034e5ecba030fb460711f40cb 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -253,7 +253,7 @@ dclean:
 	done;
 
 rehash:
-	@(PATH="`pwd`/apps:${PATH}"; sh tools/c_rehash certs)
+	@(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
 
 test:   tests