diff --git a/src/WINNT/netidmgr_plugin/NTMakefile b/src/WINNT/netidmgr_plugin/NTMakefile
index ba846733ff..6080e5cdad 100644
--- a/src/WINNT/netidmgr_plugin/NTMakefile
+++ b/src/WINNT/netidmgr_plugin/NTMakefile
@@ -37,6 +37,8 @@ AFSPLUGIN_VERLIST=$(AFSPLUGIN_VERSION_MAJOR),$(AFSPLUGIN_VERSION_MINOR),$(AFSPLU
 # short form version numbers
 TAFSPLUGIN_VERSION=$(AFSPLUGIN_VERSION_MAJOR).$(AFSPLUGIN_VERSION_MINOR).$(AFSPLUGIN_VERSION_PATCH)
 
+!INCLUDE afsp_version.h.in
+
 # Directories
 
 EXEDIR = $(DESTDIR)\root.client\usr\vice\etc
@@ -75,6 +77,7 @@ DLLFILE=$(EXEDIR)\afscred.dll
 LIBFILE=$(LIBFILEDIR)\afscred.lib
 
 INCFILES=				\
+	afsp_version.h			\
 	$(INCFILEDIR)\afspext.h		\
 	$(INCFILEDIR)\afsp_version.h
 
@@ -136,8 +139,6 @@ $(OUT)\dynimport.obj: dynimport.c
 $(OUT)\krb5common.obj: krb5common.c
 	$(PC2OBJ)
 
-!include afsp_version.h.in
-
 $(DLLFILE): $(OBJFILES) $(VERRESFILE)
 	$(DLLGUILINK) $(LIBFILES) $(SDKLIBFILES)
 	$(_VC_MANIFEST_EMBED_DLL)
@@ -175,9 +176,8 @@ $(OUT)\langres_$(LANG).res: lang\$(LANG)\langres.rc
 # End language block
 
 clean::
-!ifdef INCFILES
 	$(DEL) $(INCFILES)
-!endif
+	$(DEL) *.pdb
 	$(CD) help
 	$(MAKECMD) /f NTMakefile clean
 	$(CD) ..
diff --git a/src/WINNT/netidmgr_plugin/afsconfigdlg.c b/src/WINNT/netidmgr_plugin/afsconfigdlg.c
index 1fbf84b8db..f121007a73 100644
--- a/src/WINNT/netidmgr_plugin/afsconfigdlg.c
+++ b/src/WINNT/netidmgr_plugin/afsconfigdlg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/WINNT/netidmgr_plugin/afscred.h b/src/WINNT/netidmgr_plugin/afscred.h
index 3dad7ab405..dbf522a8ce 100644
--- a/src/WINNT/netidmgr_plugin/afscred.h
+++ b/src/WINNT/netidmgr_plugin/afscred.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/WINNT/netidmgr_plugin/afsext.c b/src/WINNT/netidmgr_plugin/afsext.c
index 5a3e5d3b2d..2e07c31354 100644
--- a/src/WINNT/netidmgr_plugin/afsext.c
+++ b/src/WINNT/netidmgr_plugin/afsext.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/WINNT/netidmgr_plugin/afsfuncs.c b/src/WINNT/netidmgr_plugin/afsfuncs.c
index f27f323d2a..421fc24df9 100644
--- a/src/WINNT/netidmgr_plugin/afsfuncs.c
+++ b/src/WINNT/netidmgr_plugin/afsfuncs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/WINNT/netidmgr_plugin/afsfuncs.h b/src/WINNT/netidmgr_plugin/afsfuncs.h
index 6a163cd707..5f6ee3fb4b 100644
--- a/src/WINNT/netidmgr_plugin/afsfuncs.h
+++ b/src/WINNT/netidmgr_plugin/afsfuncs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/WINNT/netidmgr_plugin/afshelp.c b/src/WINNT/netidmgr_plugin/afshelp.c
index e143c067ca..30a7cc6195 100644
--- a/src/WINNT/netidmgr_plugin/afshelp.c
+++ b/src/WINNT/netidmgr_plugin/afshelp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/WINNT/netidmgr_plugin/afsnewcreds.c b/src/WINNT/netidmgr_plugin/afsnewcreds.c
index e35c347752..074d866258 100644
--- a/src/WINNT/netidmgr_plugin/afsnewcreds.c
+++ b/src/WINNT/netidmgr_plugin/afsnewcreds.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/WINNT/netidmgr_plugin/afsnewcreds.h b/src/WINNT/netidmgr_plugin/afsnewcreds.h
index cc760cd274..091caf107d 100644
--- a/src/WINNT/netidmgr_plugin/afsnewcreds.h
+++ b/src/WINNT/netidmgr_plugin/afsnewcreds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/WINNT/netidmgr_plugin/afsp_version.h.in b/src/WINNT/netidmgr_plugin/afsp_version.h.in
index a15043ea5d..9e9b0f434f 100644
--- a/src/WINNT/netidmgr_plugin/afsp_version.h.in
+++ b/src/WINNT/netidmgr_plugin/afsp_version.h.in
@@ -1,6 +1,7 @@
-afsp_version.h: NTMakefile afsp_version.h.in
-        $(COPY) << $@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+
+afsp_version.h: afsp_version.h.in
+	$(COPY) << $@
+/* Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -38,3 +39,4 @@ afsp_version.h: NTMakefile afsp_version.h.in
 
 #endif
 <<
+
diff --git a/src/WINNT/netidmgr_plugin/afspext.h b/src/WINNT/netidmgr_plugin/afspext.h
index cfe802b2b9..d30bffbba0 100644
--- a/src/WINNT/netidmgr_plugin/afspext.h
+++ b/src/WINNT/netidmgr_plugin/afspext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/WINNT/netidmgr_plugin/afsplugin.c b/src/WINNT/netidmgr_plugin/afsplugin.c
index 3dd47e1ff5..7080ef38c8 100644
--- a/src/WINNT/netidmgr_plugin/afsplugin.c
+++ b/src/WINNT/netidmgr_plugin/afsplugin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/WINNT/netidmgr_plugin/afsplugin_custom.c b/src/WINNT/netidmgr_plugin/afsplugin_custom.c
index d32b8784bc..3bf583b302 100644
--- a/src/WINNT/netidmgr_plugin/afsplugin_custom.c
+++ b/src/WINNT/netidmgr_plugin/afsplugin_custom.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/WINNT/netidmgr_plugin/main.c b/src/WINNT/netidmgr_plugin/main.c
index e3569e5aa3..9164590345 100644
--- a/src/WINNT/netidmgr_plugin/main.c
+++ b/src/WINNT/netidmgr_plugin/main.c
@@ -1,4 +1,5 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* 
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/WINNT/netidmgr_plugin/params.h b/src/WINNT/netidmgr_plugin/params.h
index f0a5609195..63eafd7f1e 100644
--- a/src/WINNT/netidmgr_plugin/params.h
+++ b/src/WINNT/netidmgr_plugin/params.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/WINNT/netidmgr_plugin/version.rc b/src/WINNT/netidmgr_plugin/version.rc
index 3c9e4f5dcb..4297611b09 100644
--- a/src/WINNT/netidmgr_plugin/version.rc
+++ b/src/WINNT/netidmgr_plugin/version.rc
@@ -1,4 +1,5 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* 
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation