diff --git a/configure.in b/configure.in
index 625a4a747..eada4f71c 100644
--- a/configure.in
+++ b/configure.in
@@ -173,7 +173,7 @@ else
 fi
 
 AC_DEFINE_UNQUOTED(NGSPICEBINDIR, "`echo $dprefix/bin`" )
-AC_DEFINE_UNQUOTED(NGSPICEDATADIR, "`echo $dprefix/share/ng-spice`" )
+AC_DEFINE_UNQUOTED(NGSPICEDATADIR, "`echo $dprefix/share/ng-spice-rework`" )
 AC_DEFINE_UNQUOTED(NGSPICEBUILDDATE, "`date`" )
 
 
diff --git a/src/frontend/parser/complete.c b/src/frontend/parser/complete.c
index 3f059fc5e..2cd88696f 100644
--- a/src/frontend/parser/complete.c
+++ b/src/frontend/parser/complete.c
@@ -410,6 +410,11 @@ cp_ccon(bool on)
 #  else
 #    ifdef HAVE_TERMIOS_H
 
+#      ifdef __NetBSD__
+#        define TCGETS
+#        define TCSETS
+#      endif
+
 #      define TERM_GET TCGETS
 #      define TERM_SET TCSETS
     static struct termios sbuf;
@@ -418,7 +423,7 @@ cp_ccon(bool on)
 #    endif
 #  endif
 
-#  ifdef TERM_GET
+#  if defined(TERM_GET) || defined(__NetBSD__)
     static bool ison = FALSE;
 
     if (cp_nocc || !cp_interactive || (ison == on))
@@ -426,14 +431,26 @@ cp_ccon(bool on)
     ison = on;
 
     if (ison == TRUE) {
+#ifdef __NetBSD__
+	tcgetattr(fileno(cp_in),&OS_Buf);
+#else
 	(void) ioctl(fileno(cp_in), TERM_GET, (char *) &OS_Buf);
+#endif
 	sbuf = OS_Buf;
 	sbuf.c_cc[VEOF] = 0;
 	sbuf.c_cc[VEOL] = ESCAPE;
 	sbuf.c_cc[VEOL2] = CNTRL_D;
+#ifdef __NetBSD__
+	tcsetattr(fileno(cp_in),TCSANOW,&sbuf);
+#else
 	(void) ioctl(fileno(cp_in), TERM_SET, (char *) &sbuf);
+#endif
     } else {
+#ifdef __NetBSD__
+	tcsetattr(fileno(cp_in),TCSANOW,&OS_Buf);
+#else
 	(void) ioctl(fileno(cp_in), TERM_SET, (char *) &OS_Buf);
+#endif
     }
 
 #  endif
diff --git a/src/include/ngspice.h b/src/include/ngspice.h
index d29df380e..c8ec5e28d 100644
--- a/src/include/ngspice.h
+++ b/src/include/ngspice.h
@@ -12,6 +12,10 @@
 #include <config.h>
 #include <stddef.h>
 
+#ifdef HAVE_LIMITS_H
+#  include <machine/limits.h>
+#endif
+
 #include "memory.h"
 #include "defines.h"
 #include "macros.h"
diff --git a/src/maths/cmaths/test_cx_ph.c b/src/maths/cmaths/test_cx_ph.c
index 89efc5850..ce2f31d41 100644
--- a/src/maths/cmaths/test_cx_ph.c
+++ b/src/maths/cmaths/test_cx_ph.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <math.h>
+#include <float.h>
 
 #include <config.h>
 #include <memory.h>