diff --git a/slurm.spec b/slurm.spec
index a284b39..5136c97 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -11,8 +11,8 @@
 %undefine _strict_symbol_defs_build
 
 Name:           slurm
-Version:        18.08.5
-Release:        2%{?dist}
+Version:        18.08.6
+Release:        1%{?dist}
 Summary:        Simple Linux Utility for Resource Management
 License:        GPLv2 and BSD
 URL:            https://slurm.schedmd.com/
@@ -25,8 +25,6 @@ Source5:        slurm-setuser.in
 
 # Upstream bug #4449: release-style versioning of libslurmfull
 Patch0:         slurm_libslurmfull_version.patch
-# Upstream bug #6442 xhash_init signature change breaks xhash_test.c
-Patch1:         slurm_testsuite_xhash.patch
 
 # Build-related patches
 Patch10:        slurm_perlapi_rpaths.patch
@@ -192,7 +190,6 @@ Torque wrapper scripts used for helping migrate from Torque/PBS to Slurm.
 %prep
 %setup -q -n %{name_version}
 %patch0 -p1
-%patch1 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
@@ -721,6 +718,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod
 %systemd_postun_with_restart slurmdbd.service
 
 %changelog
+* Thu Mar 7 2019 Philip Kovacs <pkdevel@yahoo.com> - 18.08.6-1
+- Release of 18.08.6
+
 * Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 18.08.5-2
 - Rebuild for readline 8.0
 
diff --git a/slurm_testsuite_xhash.patch b/slurm_testsuite_xhash.patch
deleted file mode 100644
index e236e88..0000000
--- a/slurm_testsuite_xhash.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/testsuite/slurm_unit/common/xhash-test.c b/testsuite/slurm_unit/common/xhash-test.c
-index 54164ae6e6..46616aef2b 100644
---- a/testsuite/slurm_unit/common/xhash-test.c
-+++ b/testsuite/slurm_unit/common/xhash-test.c
-@@ -68,7 +68,7 @@ uint32_t g_hashableslen = sizeof(g_hashables)/sizeof(g_hashables[0]);
- static void setup(void)
- {
- 	int i;
--	g_ht = xhash_init(hashable_identify, NULL, NULL, 0);
-+	g_ht = xhash_init(hashable_identify, NULL);
- 	if (!g_ht) return; /* fatal error, will be detected by test cases */
- 	for (i = 0; i < g_hashableslen; ++i) {
- 		g_hashables[i].id[0] = 0;
-@@ -95,11 +95,11 @@ START_TEST(test_init_free)
- 	mark_point();
- 
- 	/* invalid case */
--	ht = xhash_init(NULL, NULL, NULL, 0);
-+	ht = xhash_init(NULL, NULL);
- 	fail_unless(ht == NULL, "allocated table without identifying function");
- 
- 	/* alloc and free */
--	ht = xhash_init(hashable_identify, NULL, NULL, 0);
-+	ht = xhash_init(hashable_identify, NULL);
- 	fail_unless(ht != NULL, "hash table was not allocated");
- 	xhash_free(ht);
- }
-@@ -111,7 +111,7 @@ START_TEST(test_add)
- 	hashable_t a[4] = {{"0", 0}, {"1", 1}, {"2", 2}, {"3", 3}};
- 	int i, len = sizeof(a)/sizeof(a[0]);
- 	char buffer[255];
--	ht = xhash_init(hashable_identify, NULL, NULL, 0);
-+	ht = xhash_init(hashable_identify, NULL);
- 	fail_unless(xhash_add(NULL, a) == NULL, "invalid cases not null");
- 	fail_unless(xhash_add(ht, NULL) == NULL, "invalid cases not null");
- 	fail_unless(xhash_add(ht, a)   != NULL, "xhash_add failed");
-@@ -207,7 +207,7 @@ START_TEST(test_count)
- 	hashable_t a[4] = {{"0", 0}, {"1", 1}, {"2", 2}, {"3", 3}};
- 	fail_unless(xhash_count(ht) == g_hashableslen,
- 		"invalid count (fixture table)");
--	ht = xhash_init(hashable_identify, NULL, NULL, 0);
-+	ht = xhash_init(hashable_identify, NULL);
- 	xhash_add(ht, a);
- 	xhash_add(ht, a+1);
- 	xhash_add(ht, a+2);
diff --git a/sources b/sources
index d11fa8b..65ebb3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (slurm-18.08.5-2.tar.bz2) = ee1991983c608208cee28a99900cfe3af48ea13568859f3355973b2cace0738dc8878fa562e20c495f52a3a5caefab552f4368465b6878f24478e15e1ffe0ca1
+SHA512 (slurm-18.08.6-2.tar.bz2) = 4eaeb15a7f99f03e670906eeabd85dd1ed20bb265444feca0aea201cd56291112076b4e725ba48b853e1c7a5c45d17dbeb8863c365977618a663af8de796f0e0