diff --git a/ag-passwd b/ag-passwd
line changes: +10/-0
index 6934a38..ebd0bc8
--- a/ag-passwd
+++ b/ag-passwd

@@ -4,6 +4,7 @@ use AwesomeGrid::User;
 
 use Crypt::PasswdMD5;			# Linux, FreeBSD
 use Digest::SHA1 qw/sha1_hex/;		# OS X 10.4
+use Crypt::Eksblowfish::Bcrypt;		# OpenBSD
 
 sub getsalt {
 	my $length = shift;

@@ -35,6 +36,14 @@ sub OSX_SHA1 {
 	return uc("$salt$hash");
 }
 
+sub OpenBSD_Bcrypt {
+	my $passwd = shift;
+	my $salt = Crypt::Eksblowfish::Bcrypt::en_base64(getsalt(16));
+	my $p = Crypt::Eksblowfish::Bcrypt::bcrypt($passwd, '$2a$08$' . $salt);
+
+	return $p;
+}
+
 my $user = shift;
 if (!$user) {
 	print "usage: ag-passwd user\n";

@@ -72,6 +81,7 @@ if ($passwd1 != $passwd1) {
 $aguser->{'passwd-unix-md5'} = unix_MD5($passwd1);
 $aguser->{'passwd-apache-md5'} = apache_MD5($passwd1);
 $aguser->{'passwd-osx-sha1'} = OSX_SHA1($passwd1);
+$aguser->{'passwd-bcrypt'} = OpenBSD_Bcrypt($passwd1);
 
 $aguser->save();
 print "Password updated.\n";

diff --git a/ag-update-openbsd b/ag-update-openbsd
line changes: +109/-0
index 0000000..9d8b42b
--- /dev/null
+++ b/ag-update-openbsd

@@ -0,0 +1,109 @@
+#!/usr/bin/perl
+use strict;
+
+use AwesomeGrid;
+use AwesomeGrid::Config;
+use AwesomeGrid::User;
+
+my $etc = '/etc';	# In production, this should be '/etc'
+
+my $config = AwesomeGrid::Config::config();
+
+# Get a list of awesomegrid users
+opendir USERS, "$AwesomeGrid::confdir/users";
+my @agusers = grep {/^[^.]/} readdir USERS;
+close USERS;
+
+# Get a list of system users
+my @sysusers;
+my @allsysusers;
+
+open PASSWD, "$etc/passwd";
+while (<PASSWD>) {
+	my ($username, undef, $uid, $gid, $gecos, $home, $shell) = split(/:/);
+	push(@allsysusers, $username);
+	next unless $gecos =~ /^\[AG\]/;	# Skip non-AG-managed users
+	push(@sysusers, $username);
+}
+close PASSWD;
+
+# Check to see what there is in /etc/passwd that should be removed.
+my @deletes;
+for my $sysuser (@sysusers) {
+	unless (grep { $_ eq $sysuser } @agusers) {
+		push(@deletes, $sysuser);
+	}
+}
+
+# Check to see which users are going to be added
+my @adds;
+for my $aguser (@agusers) {
+	unless (grep { $_ eq $aguser } @allsysusers) {
+		push(@adds, $aguser);
+	}
+}
+
+# Check to see which users should be updated
+my @updates;
+for my $user (@allsysusers) {
+	if (grep { $_ eq $user } @agusers) {
+		push(@updates, $user);
+	}
+}
+
+unless (@adds or @deletes or @updates) {
+	print "Nothing to do.\n";
+	exit 0;
+}
+
+print "Adding: ",join(' ',@adds),"\n" if @adds;
+print "Deleting: ",join(' ',@deletes),"\n" if @deletes;
+print "Updating: ",join(' ',@updates),"\n" if @updates;
+
+print "Proceed? [y/N] ";
+my $ans = <STDIN>;
+unless ($ans =~ /^[Yy]$/) {
+	exit(0);
+}
+
+# Before proceeding, make a backup copy of /etc/master.passwd
+system("cp $etc/master.passwd $etc/master.passwd.ag_backup");
+
+# Deletes first
+if (@deletes or @updates) {
+	open PASSWD, "$etc/master.passwd";
+	open PASSWDOUT, ">$etc/master.passwd.out";
+	while (<PASSWD>) {
+		my ($username) = split(/:/);
+		next if grep { $username eq $_ } (@deletes,@updates);
+		print PASSWDOUT;
+	}
+	close PASSWDOUT;
+	close PASSWD;
+}
+
+# Then add new ones.
+if (@adds or @updates) {
+	open PASSWD, ">>$etc/master.passwd.out";
+
+	for my $add (@updates,@adds) {
+		my $agu = AwesomeGrid::User->load($add);
+
+		printf PASSWD "%s:%s:%d:%d::0:0:[AG]:%s:%s\n",
+			$agu->{username}, $agu->{passwd-bcrypt},
+			$agu->{uid}, $agu->{uid},
+			"$config->{homedir}/$agu->{username}",
+			$config->{'default-shell'};
+
+		unless (-d "$config->{homedir}/$agu->{username}") {
+			print "Creating homedir for $agu->{username}\n";
+			mkdir "$config->{homedir}/$agu->{username}";
+			chown $agu->{uid}, $agu->{uid},
+				"$config->{homedir}/$agu->{username}";
+		}
+	}
+	close PASSWD;
+}
+
+# Update the passwd databases
+system('/usr/sbin/pwd_mkdb /etc/master.passwd.out')