diff --git a/Changelog b/Changelog
index 0d35ddc..79db4ce 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,7 @@
 [Changes 1.2.2]
 
-* Add save_dllvar() function exported to modules. (caf)
+* Add save_dllvar() function exported to modules, and switch cavlink
+  and nap plugins to use it. (caf)
 
 * Shitlist level 3/4 should kick regardless of /CSET KICK_IF_BANNED. 
   Reported by Ancient. (caf)
diff --git a/dll/cavlink/cavlink.c b/dll/cavlink/cavlink.c
index 8bb43a6..5a91346 100644
--- a/dll/cavlink/cavlink.c
+++ b/dll/cavlink/cavlink.c
@@ -1213,7 +1213,6 @@ BUILT_IN_DLL(cavhelp)
 
 BUILT_IN_DLL(cavsave)
 {
-IrcVariableDll *newv = NULL;
 FILE *outf = NULL;
 char *expanded = NULL;
 char buffer[BIG_BUFFER_SIZE+1];
@@ -1228,19 +1227,25 @@ char buffer[BIG_BUFFER_SIZE+1];
 		new_free(&expanded);
 		return;
 	}
-	for (newv = dll_variable; newv; newv = newv->next)
-	{
-		if (!my_strnicmp(newv->name, "cavlink", 7))
-		{
-			if (newv->type == STR_TYPE_VAR)
-			{
-				if (newv->string)
-					fprintf(outf, "SET %s %s\n", newv->name, newv->string);
-			}
-			else
-				fprintf(outf, "SET %s %d\n", newv->name, newv->integer);
-		}
-	}
+
+	save_dllvar(outf, "cavlink_pass");
+	save_dllvar(outf, "cavlink_prompt");
+	save_dllvar(outf, "cavlink_window");
+	save_dllvar(outf, "cavlink");
+	save_dllvar(outf, "cavlink_floodspawn");
+	save_dllvar(outf, "cavlink_floodquote");
+	save_dllvar(outf, "cavlink_floodmsg");
+	save_dllvar(outf, "cavlink_floodnick");
+	save_dllvar(outf, "cavlink_floodversion");
+	save_dllvar(outf, "cavlink_floodping");
+	save_dllvar(outf, "cavlink_flooddccbomb");
+	save_dllvar(outf, "cavlink_floodcycle");
+	save_dllvar(outf, "cavlink_floodecho");
+	save_dllvar(outf, "cavlink_host");
+	save_dllvar(outf, "cavlink_port");
+	save_dllvar(outf, "cavlink_attack");
+	save_dllvar(outf, "cavlink_attack_times");
+
 	cav_say("Finished saving cavlink variables to %s", buffer);
 	fclose(outf);	
 	new_free(&expanded);
diff --git a/dll/nap/nap.c b/dll/nap/nap.c
index 27a50bf..fdfc0d8 100644
--- a/dll/nap/nap.c
+++ b/dll/nap/nap.c
@@ -1331,7 +1331,6 @@ BUILT_IN_DLL(naphelp)
 
 BUILT_IN_DLL(napsave)
 {
-IrcVariableDll *newv = NULL;
 FILE *outf = NULL;
 char *expanded = NULL;
 char buffer[NAP_BUFFER_SIZE+1];
@@ -1348,21 +1347,32 @@ char *p = NULL;
 		new_free(&expanded);
 		return;
 	}
-	for (newv = dll_variable; newv; newv = newv->next)
-	{
-		if (!my_strnicmp(newv->name, "napster", 7))
-		{
-			if (newv->type == STR_TYPE_VAR)
-			{
-				if (newv->string)
-					fprintf(outf, "SET %s %s\n", newv->name, newv->string);
-			}
-			else if (newv->type == BOOL_TYPE_VAR)
-				fprintf(outf, "SET %s %s\n", newv->name, on_off(newv->integer));
-			else
-				fprintf(outf, "SET %s %d\n", newv->name, newv->integer);
-		}
-	}
+
+	save_dllvar(outf, "napster_prompt");
+	save_dllvar(outf, "napster_window");
+	save_dllvar(outf, "napster_host");
+	save_dllvar(outf, "napster_user");
+	save_dllvar(outf, "napster_pass");
+	save_dllvar(outf, "napster_email");
+	save_dllvar(outf, "napster_port");
+	save_dllvar(outf, "napster_dataport");
+	save_dllvar(outf, "napster_speed");
+	save_dllvar(outf, "napster_max_results");
+	save_dllvar(outf, "napster_numeric");
+	save_dllvar(outf, "napster_download_dir");
+	save_dllvar(outf, "napster_names_nickcolor");
+	save_dllvar(outf, "napster_hotlist_online");
+	save_dllvar(outf, "napster_hotlist_offline");
+	save_dllvar(outf, "napster_show_numeric");
+	save_dllvar(outf, "napster_window_hidden");
+	save_dllvar(outf, "napster_resume_download");
+	save_dllvar(outf, "napster_send_limit");
+	save_dllvar(outf, "napster_names_columns");
+	save_dllvar(outf, "napster_share");
+	save_dllvar(outf, "napster_max_send_nick");
+	save_dllvar(outf, "napster_format");
+	save_dllvar(outf, "napster_dir");
+
 	for (new = nap_hotlist; new; new = new->next)
 		m_s3cat(&p, " ", new->nick);
 	if (p)