diff -Naur netpipes/Makefile netpipes-new/Makefile
--- netpipes/Makefile	Wed Oct 28 12:30:03 1998
+++ netpipes-new/Makefile	Wed Apr 11 11:10:59 2001
@@ -17,8 +17,8 @@
 
 # You probably want to change this:
 #INSTROOT = ${HOME}
-INSTROOT = /depot/collections0/netpipes4.1
-#INSTROOT = /usr/local
+#INSTROOT = /depot/collections0/netpipes4.1
+INSTROOT = /usr/local
 INSTBIN = ${INSTROOT}/bin
 INSTMAN = ${INSTROOT}/man
 
@@ -86,7 +86,7 @@
 
 # gcc can handle both -O and -g at once
 #CDEBUGFLAGS = -g # -Wall -DDEBUG
-CDEBUGFLAGS = -O
+CDEBUGFLAGS = -O2
 
 ######################################################################
 
@@ -98,10 +98,11 @@
 EOBJS = encapsulate.o common.o version.o memmove.o
 SSLOBJS = ssl-auth.o ssl-criteria.o common.o version.o memmove.o
 
-SSLDIR = /usr/local/ssl
+SSLDIR = /usr/local
+#/ssl
 SSLINC = -I${SSLDIR}/include
-#SSLLIB = -L${SSLDIR}/lib -lssl -lcrypto
-SSLLIB = -L../SSLeay-0.8.1 -lssl -lcrypto
+SSLLIB = -L${SSLDIR}/lib -lssl -lcrypto
+#SSLLIB = -L../SSLeay-0.8.1 -lssl -lcrypto
 
 MANPAGES = netpipes.1 faucet.1 hose.1 \
 	sockdown.1 getpeername.1 timelimit.1 encapsulate.1 \
diff -Naur netpipes/ssl-auth.c netpipes-new/ssl-auth.c
--- netpipes/ssl-auth.c	Wed Oct 28 12:30:05 1998
+++ netpipes-new/ssl-auth.c	Wed Apr 11 11:13:05 2001
@@ -58,11 +58,11 @@
 #include "common.h"
 #include "memmove.h"
 
-#include <buffer.h>
-#include <ssl.h>
-#include <err.h>
-#include <crypto.h>
-#include <pem.h>
+#include <openssl/buffer.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/crypto.h>
+#include <openssl/pem.h>
 
 #include "ssl-criteria.h"
 
@@ -911,7 +911,7 @@
 		    BIO_printf(bio_err,"Generating temp (512 bit) RSA key...");
 		    BIO_flush(bio_err);
 		}
-	    rsa_tmp=RSA_generate_key(512,RSA_F4,NULL);
+	    rsa_tmp=RSA_generate_key(512,RSA_F4,NULL,NULL);
 	    if (!s_quiet)
 		{
 		    BIO_printf(bio_err,"\n");
@@ -1297,7 +1297,7 @@
 
     if ( criteria != 0 ) {
 	debug_print_criteria_node(stderr, criteria, 0);
-	SSL_CTX_set_cert_verify_cb(ctx,replacement_X509_verify_cert,(char*)criteria);
+	SSL_CTX_set_cert_verify_callback(ctx,replacement_X509_verify_cert,(char*)criteria);
 	verify |= SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT|SSL_VERIFY_CLIENT_ONCE;
     }
 
diff -Naur netpipes/ssl-criteria.c netpipes-new/ssl-criteria.c
--- netpipes/ssl-criteria.c	Wed Oct 28 12:30:05 1998
+++ netpipes-new/ssl-criteria.c	Wed Apr 11 11:04:51 2001
@@ -26,11 +26,11 @@
 
 #include "common.h"
 
-#include <buffer.h>
-#include <ssl.h>
-#include <x509.h>
-#include <pem.h>
-#include <err.h>
+#include <openssl/buffer.h>
+#include <openssl/ssl.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/err.h>
 
 #include "ssl-criteria.h"
 
@@ -305,7 +305,7 @@
 	return 0;
     }
 
-    x = PEM_read_bio_X509(in, NULL, (int(*)())0);
+    x = PEM_read_bio_X509(in, NULL, NULL, (int(*)())0);
 
     BIO_free(in);