diff --git a/Makefile.in b/Makefile.in
index 62812b4..0f43142 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.20 2012/06/13 13:50:16 imilh Exp $
+# This is a BSD-style Makefile for pkgin.
 
 PROG=		pkgin
 MAN=		pkgin.1
diff --git a/actions.c b/actions.c
index 6b3d425..c573af0 100644
--- a/actions.c
+++ b/actions.c
@@ -1,5 +1,3 @@
-/* $Id: actions.c,v 1.56 2013/01/31 19:49:34 stacktic Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include "pkgin.h"
diff --git a/autoremove.c b/autoremove.c
index 563f3a2..a31c72e 100644
--- a/autoremove.c
+++ b/autoremove.c
@@ -1,5 +1,3 @@
-/* $Id: autoremove.c,v 1.21 2012/10/02 10:20:24 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 /**
diff --git a/cmd.h b/cmd.h
index c27a56d..bc515d3 100644
--- a/cmd.h
+++ b/cmd.h
@@ -1,5 +1,3 @@
-/* $Id: cmd.h,v 1.15 2012/10/02 10:20:24 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 static struct command {
diff --git a/configure.ac b/configure.ac
index 77a6224..02a0467 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,3 @@
-# $Id: configure.ac,v 1.22 2013/02/25 11:34:46 imilh Exp $
-
 AC_PREREQ([2.61])
 AC_INIT([pkgin], [0.9.4.99], [imil@NetBSD.org])
 AC_CONFIG_SRCDIR([actions.c])
diff --git a/depends.c b/depends.c
index 90036b1..8ef08a1 100644
--- a/depends.c
+++ b/depends.c
@@ -1,5 +1,3 @@
-/* $Id: depends.c,v 1.10 2011/10/22 12:48:40 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include "pkgin.h"
diff --git a/download.c b/download.c
index ea2a9f6..c8f98cb 100644
--- a/download.c
+++ b/download.c
@@ -1,5 +1,3 @@
-/* $Id: download.c,v 1.15 2012/07/15 17:36:34 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include "pkgin.h"
diff --git a/external/humanize_number.c b/external/humanize_number.c
index 94566e0..f1aa29b 100644
--- a/external/humanize_number.c
+++ b/external/humanize_number.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: humanize_number.c,v 1.14 2008/04/28 20:22:59 martin Exp $	*/
+/* NetBSD: humanize_number.c,v 1.14 2008/04/28 20:22:59 martin Exp */
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
diff --git a/external/lib.h b/external/lib.h
index 7f1f579..f3cfef1 100644
--- a/external/lib.h
+++ b/external/lib.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lib.h,v 1.69 2018/02/26 23:45:02 ginsbach Exp $ */
+/* NetBSD: lib.h,v 1.69 2018/02/26 23:45:02 ginsbach Exp */
 
 /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
 
diff --git a/external/progressmeter.c b/external/progressmeter.c
index 63b8df8..045bfe0 100644
--- a/external/progressmeter.c
+++ b/external/progressmeter.c
@@ -1,5 +1,5 @@
-/*	$NetBSD: progressmeter.c,v 1.9 2008/08/05 14:13:34 simonb Exp $	*/
-/* $OpenBSD: progressmeter.c,v 1.37 2006/08/03 03:34:42 deraadt Exp $ */
+/* NetBSD: progressmeter.c,v 1.9 2008/08/05 14:13:34 simonb Exp */
+/* OpenBSD: progressmeter.c,v 1.37 2006/08/03 03:34:42 deraadt Exp */
 /*
  * Copyright (c) 2003 Nils Nordman.  All rights reserved.
  *
diff --git a/external/progressmeter.h b/external/progressmeter.h
index bd533f7..df12db0 100644
--- a/external/progressmeter.h
+++ b/external/progressmeter.h
@@ -1,5 +1,5 @@
-/*	$NetBSD: progressmeter.h,v 1.2 2006/09/28 21:22:14 christos Exp $	*/
-/* $OpenBSD: progressmeter.h,v 1.2 2006/03/25 22:22:43 djm Exp $ */
+/* NetBSD: progressmeter.h,v 1.2 2006/09/28 21:22:14 christos Exp */
+/* OpenBSD: progressmeter.h,v 1.2 2006/03/25 22:22:43 djm Exp */
 /*
  * Copyright (c) 2002 Nils Nordman.  All rights reserved.
  *
diff --git a/fsops.c b/fsops.c
index a538bee..08aabf6 100644
--- a/fsops.c
+++ b/fsops.c
@@ -1,5 +1,3 @@
-/* $Id: fsops.c,v 1.7 2012/12/13 21:51:03 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include <sys/statvfs.h>
diff --git a/impact.c b/impact.c
index 416ce66..3cff4c6 100644
--- a/impact.c
+++ b/impact.c
@@ -1,5 +1,3 @@
-/* $Id: impact.c,v 1.17 2012/04/29 10:15:44 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 /**
diff --git a/main.c b/main.c
index b2dcb99..5b8744b 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,3 @@
-/* $Id: main.c,v 1.33 2012/12/02 13:33:28 stacktic Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include "pkgin.h"
diff --git a/messages.h b/messages.h
index 645199f..e8afa5c 100644
--- a/messages.h
+++ b/messages.h
@@ -1,5 +1,3 @@
-/* $Id: messages.h,v 1.33 2012/11/25 09:13:38 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 /* main.c */
diff --git a/mkpkgindb.sh b/mkpkgindb.sh
index 53485be..9c45546 100755
--- a/mkpkgindb.sh
+++ b/mkpkgindb.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $Id: mkpkgindb.sh,v 1.2 2011/09/11 08:41:20 imilh Exp $
-
 echo "/* automatically generated, DO NOT EDIT */"
 echo '#define CREATE_DRYDB " \'
 ${SEDCMD} -e 's/$/ \\/' -e 's/\"/\\\"/g' pkgin.sql
diff --git a/order.c b/order.c
index cd2e87a..ff5ce14 100644
--- a/order.c
+++ b/order.c
@@ -1,5 +1,3 @@
-/* $Id: order.c,v 1.6 2011/10/02 14:54:12 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include "pkgin.h"
diff --git a/pkg_check.c b/pkg_check.c
index e47c700..7e25a23 100644
--- a/pkg_check.c
+++ b/pkg_check.c
@@ -1,5 +1,3 @@
-/* $Id: pkg_check.c,v 1.7 2012/07/15 17:36:34 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include "pkgin.h"
diff --git a/pkg_infos.c b/pkg_infos.c
index 846ef30..fcd68e9 100644
--- a/pkg_infos.c
+++ b/pkg_infos.c
@@ -1,5 +1,3 @@
-/* $Id: pkg_infos.c,v 1.2 2012/04/15 20:58:23 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include "pkgin.h"
diff --git a/pkg_str.c b/pkg_str.c
index 23ffff9..b97f690 100644
--- a/pkg_str.c
+++ b/pkg_str.c
@@ -1,5 +1,3 @@
-/* $Id: pkg_str.c,v 1.12 2012/11/24 18:37:42 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include "pkgin.h"
diff --git a/pkgin.h b/pkgin.h
index 3b1489c..490efdc 100644
--- a/pkgin.h
+++ b/pkgin.h
@@ -1,5 +1,3 @@
-/* $Id: pkgin.h,v 1.41 2012/11/17 14:04:13 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #ifndef _PKGIN_H
diff --git a/pkgindb.c b/pkgindb.c
index bbfb645..50b6298 100644
--- a/pkgindb.c
+++ b/pkgindb.c
@@ -1,5 +1,3 @@
-/* $Id: pkgindb.c,v 1.12 2012/05/30 09:27:12 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include <sqlite3.h>
diff --git a/pkgindb.h b/pkgindb.h
index 2087f99..7954833 100644
--- a/pkgindb.h
+++ b/pkgindb.h
@@ -1,5 +1,3 @@
-/* $Id: pkgindb.h,v 1.12 2012/05/28 10:56:27 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #ifndef _DRYDB_H
diff --git a/pkgindb_queries.c b/pkgindb_queries.c
index 7c9d8fb..519eefe 100644
--- a/pkgindb_queries.c
+++ b/pkgindb_queries.c
@@ -1,5 +1,3 @@
-/* $Id: pkgindb_queries.c,v 1.27 2012/11/24 18:37:42 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 const char DROP_LOCAL_TABLES[] =
diff --git a/pkglist.c b/pkglist.c
index 142f084..31a61e2 100644
--- a/pkglist.c
+++ b/pkglist.c
@@ -1,5 +1,3 @@
-/* $Id: pkglist.c,v 1.11 2012/07/15 17:36:34 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include "pkgin.h"
diff --git a/repositories.conf b/repositories.conf
index c7a4d90..7dc22ee 100644
--- a/repositories.conf
+++ b/repositories.conf
@@ -1,4 +1,3 @@
-# $Id: repositories.conf,v 1.3 2012/06/13 13:50:17 imilh Exp $
 #
 # Pkgin repositories list
 #
diff --git a/selection.c b/selection.c
index 19ff571..b8142e5 100644
--- a/selection.c
+++ b/selection.c
@@ -1,5 +1,3 @@
-/* $Id: selection.c,v 1.7 2012/11/25 09:13:38 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include "pkgin.h"
diff --git a/sqlite_callbacks.c b/sqlite_callbacks.c
index 150be79..73531d7 100644
--- a/sqlite_callbacks.c
+++ b/sqlite_callbacks.c
@@ -1,5 +1,3 @@
-/* $Id: sqlite_callbacks.c,v 1.16 2012/08/01 11:07:51 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include "pkgin.h"
diff --git a/summary.c b/summary.c
index 6c84e12..6492b67 100644
--- a/summary.c
+++ b/summary.c
@@ -1,5 +1,3 @@
-/* $Id: summary.c,v 1.33 2012/07/15 17:36:34 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 /**
diff --git a/tools.c b/tools.c
index 37a0ef6..9529d13 100644
--- a/tools.c
+++ b/tools.c
@@ -1,5 +1,3 @@
-/* $Id: tools.c,v 1.5 2012/08/04 14:23:46 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include "tools.h"
diff --git a/tools.h b/tools.h
index 150e5b6..d691efd 100644
--- a/tools.h
+++ b/tools.h
@@ -1,5 +1,3 @@
-/* $Id: tools.h,v 1.5 2012/08/04 14:23:46 imilh Exp $ */
-
 /*
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #ifndef _TOOLS_H