3 files changed, 14 insertions, 3 deletions
diff --git a/TODO.dan b/TODO.dan
index 42b0f651..8d993985 100644
--- a/TODO.dan
+++ b/TODO.dan
@@ -84,9 +84,20 @@ may need to use some wchar_t output on the progress bar as char/byte counts
 differ here.
 
 Rewrite makepkg to use terminal-safe coloring/bolding. tput utility should
-allow us to do this.
+allow us to do this. Make universal message functions for systemwide use,
+including all pacman utilites- abs, pacman-optimize, etc.
 
-Bugs/FRs to smash: 6468, 6437, 6430?, 6420, 6404, 6389, 6312?, 6284, 6273?, 6255?, 6208, 5987, 5885, 5571, 4182, 3492, 2810?, 1769, 1588, 1571
+Bugs/FRs to smash: 6468, 6437, 6430?, 6420, 6404, 6389, 6312?, 6284, 6273?,
+6255?, 6208, 5987, 5885, 5571, 4182, 3492, 2810?, 1769, 1588, 1571
+
+Remove _alpm from function names now that we have SYMHIDDEN and static
+declarations.
+
+Remove alpm.c, put functions where they should be.
+
+Update doxygen comments, they may need some work. Try to document all of the
+private internal functions too- it helps a ton for people just getting a
+start on pacman hacking.
 
 Other smaller things:
 ---------------------
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index b11d12c8..b299c629 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -2,5 +2,6 @@ EXTRA_DIST = \
 	bash_completion \
 	pacsearch \
 	pacdiff \
+	re-pacman \
 	zsh_completion
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 9592cb4f..57baee49 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -11,7 +11,6 @@ bin_SCRIPTS = \
 	rankmirrors \
 	repo-add \
 	repo-remove \
-	re-pacman \
 	updatesync
 
 EXTRA_DIST = $(bin_SCRIPTS)