diff --git a/compat/my_getopt.c b/compat/my_getopt.c
diff --git a/compat/my_getopt.h b/compat/my_getopt.h
diff --git a/configure b/configure
@@ -621,6 +621,7 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+VERSION
 RUNDIR
 ENABLE_STATIC
 ENABLE_SHARED
@@ -4472,6 +4473,8 @@ $as_echo "$as_me: WARNING: *** You have not enabled versioned symbols." >&2;}
 
 fi
 
+VERSION=0.101
+
 
 
 
@@ -5758,3 +5761,6 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Autotool/configure/make are deprecated, and will be removed soon. Please using \"meson\" instead" >&5
+$as_echo "$as_me: WARNING: Autotool/configure/make are deprecated, and will be removed soon. Please using \"meson\" instead" >&2;}
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(open-isns, [0.101])
+AC_INIT(open-isns, [0.102])
 AC_CONFIG_SRCDIR([isnsd.c])
 AC_CONFIG_AUX_DIR([aclocal])
 
@@ -161,8 +161,13 @@ if test "x$ENABLE_SHARED" = "x1" ; then
 	AC_SUBST(HAVE_LD_VERSION_SCRIPT)
 fi
 
+VERSION=AC_PACKAGE_VERSION
 AC_SUBST(ENABLE_SHARED)
 AC_SUBST(ENABLE_STATIC)
 AC_SUBST(RUNDIR)
+AC_SUBST(VERSION)
 
 AC_OUTPUT(Makefile include/libisns/paths.h)
+
+dnl Warn user that autoconf is deprecated here
+AC_MSG_WARN([Autotool/configure/make are deprecated, and will be removed soon. Please using "meson" instead])
diff --git a/doc/isns_config.5 b/doc/isns_config.5
@@ -46,7 +46,7 @@ hostname using the
 system call, and use a DNS lookup to look up the canonical name.
 Using the
 .BR HostName
-option, you can overried this. This option is rarely needed.
+option, you can override this. This option is rarely needed.
 .TP
 .BR SourceName
 This option is mandatory for all Open-iSNS applications.

diff --git a/doc/meson.build b/doc/meson.build
@@ -0,0 +1,10 @@
+# meson build file for open-isns doc (man pages)
+
+# do not install isnssetup.8, as it's a man page
+# for aninternal script
+man8_pages = files([
+  'isnsd.8',
+  'isnsdd.8',
+  'isnsadm.8'])
+man5_pages = files([
+  'isns_config.5'])
diff --git a/etc/meson.build b/etc/meson.build
@@ -0,0 +1,6 @@
+# meson build file for open-isns etc files
+
+config_files = files([
+  'isnsd.conf',
+  'isnsdd.conf',
+  'isnsadm.conf'])
diff --git a/include/libisns/meson.build b/include/libisns/meson.build
@@ -0,0 +1,27 @@
+# meson build control file for open-isns public include files
+
+inc_conf = configuration_data()
+inc_conf.set('RUNDIR', get_option('rundir'))
+inc_conf.set('VERSION', meson.project_version())
+
+static_hdr_files = files([
+  'attrs.h',
+  'buffer.h',
+  'isns.h',
+  'isns-proto.h',
+  'message.h',
+  'source.h',
+  'types.h',
+  'util.h'])
+
+template_hdr_name = 'paths.h'
+template_hdr_file = files('paths.h.in')
+
+configure_file(
+  input: template_hdr_file,
+  output: template_hdr_name,
+  configuration: inc_conf,
+  install: true,
+  install_dir: get_option('includedir') / 'libisns')
+
+install_headers(static_hdr_files, subdir: 'libisns')
diff --git a/include/libisns/paths.h.in b/include/libisns/paths.h.in
@@ -10,7 +10,7 @@
 
 #define __OPENISNS_MKVERSION(maj, min)	(((maj) << 8) + (min))
 #define OPENISNS_VERSION		__OPENISNS_MKVERSION(0, 101);
-#define OPENISNS_VERSION_STRING		"0.101"
+#define OPENISNS_VERSION_STRING		"@VERSION@"
 
 #define ISNS_ETCDIR			"/etc/isns"
 #define ISNS_RUNDIR			"@RUNDIR@"

diff --git a/isnsadm.c b/isnsadm.c
@@ -97,7 +97,7 @@ main(int argc, char **argv)
 	isns_security_t	*security = NULL;
 	int		c, status;
 
-	while ((c = getopt_long(argc, argv, "46Cc:d:hK:k:ls:", options, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "46Cc:d:hK:k:ls:Vr", options, NULL)) != -1) {
 		switch (c) {
 		case '4':
 			opt_af = AF_INET;

diff --git a/isnsd.c b/isnsd.c
@@ -29,7 +29,8 @@ enum {
 };
 
 static const char *	opt_configfile = ISNS_DEFAULT_ISNSD_CONFIG;
-static int		opt_af = AF_UNSPEC;
+static int		opt_af = AF_INET6; // should be AF_INET6 as described in isnsd's manual
+
 static int		opt_mode = MODE_NORMAL;
 static int		opt_foreground = 0;
 

diff --git a/libisns.pc b/libisns.pc
@@ -0,0 +1,8 @@
+includedir=/usr/include
+libdir=/usr/lib64
+
+Name: libisns
+Version: 0.102
+Description: iSNS user space library
+Libs: -L${libdir} -lisns
+Cflags: -I${includedir}
diff --git a/meson.build b/meson.build
@@ -0,0 +1,207 @@
+# meson build for open-isns
+
+project('libisns', 'c',
+  version: '0.102',
+  meson_version: '>= 0.54.0',
+  license: 'LGPL-2.1-or-later',
+  default_options: [
+    'c_std=gnu99',
+    'warning_level=2',
+    'buildtype=release',
+    'libdir=/usr/lib64',
+    'prefix=/usr']
+  )
+
+# we will need this below
+cc = meson.get_compiler('c')
+
+# get feature options
+security_dep = dependency('libcrypto', required: get_option('security'))
+slp_dep = cc.find_library('slp', required: get_option('slp'))
+
+subdir('tests')
+subdir('doc')
+subdir('etc')
+subdir('include/libisns')
+
+lib_srcs = files([
+  'server.c',
+  'client.c',
+  'objects.c',
+  'callback.c',
+  'timer.c',
+  'vendor.c',
+  'db.c',
+  'db-file.c',
+  'db-policy.c',
+  'relation.c',
+  'scope.c',
+  'message.c',
+  'security.c',
+  'authblock.c',
+  'policy.c',
+  'pki.c',
+  'register.c',
+  'query.c',
+  'getnext.c',
+  'deregister.c',
+  'esi.c',
+  'scn.c',
+  'dd.c',
+  'entity.c',
+  'portal-group.c',
+  'storage-node.c',
+  'domain.c',
+  'simple.c',
+  'tags.c',
+  'attrs.c',
+  'export.c',
+  'socket.c',
+  'slp.c',
+  'error.c',
+  'logging.c',
+  'config.c',
+  'parser.c',
+  'buffer.c',
+  'pidfile.c',
+  'sysdep-unix.c',
+  'util.c',
+  'bitvector.c',
+  'mdebug.c'])
+
+incl_dirs = include_directories(['.', 'include'])
+
+add_project_arguments(
+  ['-D_GNU_SOURCE'],
+  language: 'c')
+
+#
+# build our config.h file
+#
+
+conf = configuration_data()
+conf.set('WITH_SECURITY', security_dep.found())
+conf.set('WITH_SLP', slp_dep.found())
+conf.set('HAVE_SLP_H', slp_dep.found())
+
+config_h = configure_file(
+  output: 'config.h',
+  configuration: conf)
+
+config_incdir = include_directories('.')
+
+config_dep = declare_dependency(
+  include_directories: config_incdir,
+  sources: config_h)
+
+#
+# build our library -- we always build either the static or
+# the shared library, or both
+#
+
+lib_deps = [config_dep, security_dep, slp_dep]
+
+shared_link_args = []
+if get_option('shared_version')
+  shared_link_args = '-Wl,--version-script=@0@/libisns.vers'.format(meson.current_source_dir())
+endif
+
+libisns_lib = library('isns',
+  lib_srcs,
+  include_directories: incl_dirs,
+  dependencies: lib_deps,
+  link_args: shared_link_args,
+  version: '0',
+  install: true)
+
+libisns_dep = declare_dependency(link_with: libisns_lib)
+
+#
+# build binaries
+#
+
+our_dependencies = [config_dep, security_dep, libisns_dep, slp_dep]
+
+sbin_dir = get_option('sbindir')
+
+executable('isnsd',
+  sources: files('isnsd.c'),
+  include_directories: incl_dirs,
+  dependencies: our_dependencies,
+  install: true,
+  install_dir: sbin_dir)
+
+executable('isnsdd',
+  sources: files(['isnsdd.c', 'local.c']),
+  include_directories: incl_dirs,
+  dependencies: our_dependencies,
+  install: true,
+  install_dir: sbin_dir)
+
+executable('isnsadm',
+  sources: files('isnsadm.c'),
+  include_directories: incl_dirs,
+  dependencies: our_dependencies,
+  install: true,
+  install_dir: sbin_dir)
+
+# a testing program (not installed, not currently used here)
+e = executable('bitvector',
+  sources: files('bitvector.c'),
+  include_directories: incl_dirs,
+  dependencies: our_dependencies,
+  c_args: ['-DTEST'])
+test('test bitvector', e)
+
+# build our test files ??? (FIXME: not working)
+pyunit_test_works = false
+if pyunit_test_works
+  test_progs = []
+  foreach t: tests
+    e = executable(t,
+      sources: files('tests' / t + '.c'),
+      include_directories: incl_dirs,
+      dependencies: our_dependencies)
+    test_progs += e
+  endforeach
+endif
+
+#
+# man pages
+#
+install_man([man8_pages, man5_pages])
+
+#
+# config files
+#
+install_data(config_files,
+  install_dir: get_option('sysconfdir') / 'isns')
+
+#
+# systemd service files
+#
+install_data(files(['isnsd.service', 'isnsd.socket']),
+  install_dir: get_option('systemddir') / 'system')
+
+#
+# our package file
+#
+pkg_mod = import('pkgconfig')
+pkg_mod.generate(libraries: libisns_lib,
+  version: '0',
+  name: 'libisns',
+  description: 'iSNS userspace library')
+
+#
+# public header files are installed from # include/libisns
+#
+
+#
+# lastly, create our runtime directory (empty)
+#
+# NOTE: this can be replaced with install_emptydir() once
+# the minimum requirement of Meson is bumped to >=0.60.0
+
+install_subdir('isns',
+  install_dir: '/var/lib',
+  install_mode: 'r--------')
diff --git a/meson_options.txt b/meson_options.txt
@@ -0,0 +1,18 @@
+# meson options for open-isns
+
+# enabled security and service location protocol usage by default
+option('security', type: 'feature', value: 'auto',
+  description: 'enable security using libcrypt')
+option('slp', type: 'feature', value: 'auto',
+  description: 'enable use of Service Location Protocol')
+
+# disable shared library creation and enable static library
+# creation, by default
+option('shared_version', type: 'boolean', value: true,
+  description: 'use library versioning on the shared library')
+
+# set default locations for systemd and runtime files
+option('systemddir', type: 'string', value: '/usr/lib/systemd',
+  description: 'override systemd directory "/usr/lib/systemd"')
+option('rundir', type: 'string', value: '/var/run',
+  description: 'override runtime directory "/var/run"')
diff --git a/slp.c b/slp.c
@@ -29,25 +29,26 @@ struct isns_slp_url_state {
 };
 
 static void
-isns_slp_report(SLPHandle handle, SLPError err, void *cookie)
+isns_slp_report(__attribute__((unused))SLPHandle handle,
+		SLPError err, void *cookie)
 {
 	*(SLPError *) cookie = err;
 }
 
 /*
  * Register a service with SLP
- */ 
+ */
 int
 isns_slp_register(const char *url)
 {
-	SLPError	err, callbackerr; 
-	SLPHandle	handle = NULL; 
+	SLPError	err, callbackerr;
+	SLPHandle	handle = NULL;
 
-	err = SLPOpen("en", SLP_FALSE, &handle); 
-	if(err != SLP_OK) { 
+	err = SLPOpen("en", SLP_FALSE, &handle);
+	if(err != SLP_OK) {
 		isns_error("Unable to obtain SLP handle (err %d)\n", err);
 		return 0;
-	} 
+	}
 
 	err = SLPReg(handle, url, SLP_LIFETIME_MAXIMUM,
 			ISNS_SLP_SCOPE,
@@ -69,20 +70,20 @@ isns_slp_register(const char *url)
 
 /*
  * DeRegister a service
- */ 
+ */
 int
 isns_slp_unregister(const char *url)
 {
-	SLPError	err, callbackerr; 
-	SLPHandle	handle = NULL; 
+	SLPError	err, callbackerr;
+	SLPHandle	handle = NULL;
 
 	isns_debug_general("SLP: Unregistering \"%s\"\n", url);
 
-	err = SLPOpen("en", SLP_FALSE, &handle); 
-	if(err != SLP_OK) { 
+	err = SLPOpen("en", SLP_FALSE, &handle);
+	if(err != SLP_OK) {
 		isns_error("Unable to obtain SLP handle (err %d)\n", err);
 		return 0;
-	} 
+	}
 
 	err = SLPDereg(handle, url, isns_slp_report, &callbackerr);
 
@@ -102,9 +103,11 @@ isns_slp_unregister(const char *url)
  * Find an iSNS server through SLP
  */
 static SLPBoolean
-isns_slp_url_callback(SLPHandle handle,
-		const char *url, unsigned short lifetime,
-		SLPError err, void *cookie) 
+isns_slp_url_callback(__attribute__((unused))SLPHandle handle,
+		const char *url,
+		__attribute__((unused))unsigned short lifetime,
+		SLPError err,
+		void *cookie)
 {
 	struct isns_slp_url_state *sp = cookie;
 	SLPSrvURL	*parsed_url = NULL;
@@ -159,19 +162,19 @@ char *
 isns_slp_find(void)
 {
 	static struct isns_slp_url_state state;
-	SLPHandle	handle = NULL; 
-	SLPError	err; 
+	SLPHandle	handle = NULL;
+	SLPError	err;
 
 	if (state.slp_url)
 		return state.slp_url;
 
 	isns_debug_general("Using SLP to locate iSNS server\n");
 
-	err = SLPOpen("en", SLP_FALSE, &handle); 
-	if(err != SLP_OK) { 
+	err = SLPOpen("en", SLP_FALSE, &handle);
+	if(err != SLP_OK) {
 		isns_error("Unable to obtain SLP handle (err %d)\n", err);
 		return NULL;
-	} 
+	}
 
 	err = SLPFindSrvs(handle, ISNS_SLP_SERVICE_NAME,
 			NULL, "(protocols=isns)",

diff --git a/tests/genkey b/tests/genkey
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # 
 # This is a very simple script to generate a DSA
 # key pair for authenticated iSNS.
@@ -25,7 +25,7 @@ dsa_bits=1024
 opt_force=0
 opt_server=0
 
-function usage {
+usage() {
 	cat <<-EOF >&2
 	$*
 	Usage:
@@ -35,7 +35,7 @@ function usage {
 	exit 1
 }
 
-function make_isns_name {
+make_isns_name() {
 	OFS="$IFS"
 	IFS=.
 	set -- $*

diff --git a/tests/meson.build b/tests/meson.build
@@ -0,0 +1,5 @@
+# meson build control file for open-isns tests
+
+tests = ['pauw1', 'pauw2', 'pauw3', 'pauw4']
+
+test_prog = find_program('test-isns.py')