diff --git a/www/drupal5/core/Makefile b/www/drupal5/core/Makefile
index 2c0f3a2875e..4f9a778213a 100644
--- a/www/drupal5/core/Makefile
+++ b/www/drupal5/core/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2008/07/26 10:34:01 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2008/08/19 23:44:48 espie Exp $
 
 COMMENT =	powerful content management system
  
-DISTNAME =	drupal-5.9
+DISTNAME =	drupal-5.10
 PKGNAME=	${DISTNAME}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/www/drupal5/core/distinfo b/www/drupal5/core/distinfo
index 0a230380d8d..9b02998f7aa 100644
--- a/www/drupal5/core/distinfo
+++ b/www/drupal5/core/distinfo
@@ -1,5 +1,5 @@
-MD5 (drupal5/drupal-5.9.tar.gz) = KTf9FQPuPSLSMuJZ2DnjFA==
-RMD160 (drupal5/drupal-5.9.tar.gz) = EVxw6YZVEpttRrNGDSZKqWp2NBk=
-SHA1 (drupal5/drupal-5.9.tar.gz) = OiRoKrznmOKU+mvdtqPo7ziIguE=
-SHA256 (drupal5/drupal-5.9.tar.gz) = qqkVyu5w414Dj4x9Oi25XmFU0oxbqfPdCjM7kEno2FY=
-SIZE (drupal5/drupal-5.9.tar.gz) = 756520
+MD5 (drupal5/drupal-5.10.tar.gz) = gZqRTpfeSNKyqKtpVdASFQ==
+RMD160 (drupal5/drupal-5.10.tar.gz) = 1CTlmq2R5+apXBAbC9yYwZrjpoY=
+SHA1 (drupal5/drupal-5.10.tar.gz) = DHItdWCOJQOf/uRIpFByGrod5ko=
+SHA256 (drupal5/drupal-5.10.tar.gz) = ceRN+cu8WKTxFrCJyCyo8Dy9KTPkBy3KnKCwrD38B1c=
+SIZE (drupal5/drupal-5.10.tar.gz) = 762496
diff --git a/www/drupal5/core/patches/patch-includes_form_inc b/www/drupal5/core/patches/patch-includes_form_inc
index 74ee40d09c6..bb94d3bf2fa 100644
--- a/www/drupal5/core/patches/patch-includes_form_inc
+++ b/www/drupal5/core/patches/patch-includes_form_inc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-includes_form_inc,v 1.1 2008/03/15 09:36:48 espie Exp $
---- includes/form.inc.orig	Sun Feb 17 13:00:26 2008
-+++ includes/form.inc	Sun Feb 17 13:00:40 2008
-@@ -1122,6 +1122,13 @@ function expand_password_confirm($element) {
+$OpenBSD: patch-includes_form_inc,v 1.2 2008/08/19 23:44:48 espie Exp $
+--- includes/form.inc.orig	Mon Aug  4 06:00:24 2008
++++ includes/form.inc	Thu Aug 14 11:29:23 2008
+@@ -1123,6 +1123,13 @@ function expand_password_confirm($element) {
      '#value' => $element['#value']['pass2'],
      '#required' => $element['#required'],
    );
@@ -15,7 +15,7 @@ $OpenBSD: patch-includes_form_inc,v 1.1 2008/03/15 09:36:48 espie Exp $
    $element['#validate'] = array('password_confirm_validate' => array());
    $element['#tree'] = TRUE;
  
-@@ -1132,19 +1139,51 @@ function expand_password_confirm($element) {
+@@ -1133,19 +1140,51 @@ function expand_password_confirm($element) {
    return $element;
  }
  
diff --git a/www/drupal5/core/patches/patch-modules_user_user_module b/www/drupal5/core/patches/patch-modules_user_user_module
index cd77f3b66d8..baa8a03a7c5 100644
--- a/www/drupal5/core/patches/patch-modules_user_user_module
+++ b/www/drupal5/core/patches/patch-modules_user_user_module
@@ -1,6 +1,6 @@
-$OpenBSD: patch-modules_user_user_module,v 1.2 2008/07/26 10:34:01 espie Exp $
---- modules/user/user.module.orig	Wed Jul 16 21:46:02 2008
-+++ modules/user/user.module	Sat Jul 26 12:28:35 2008
+$OpenBSD: patch-modules_user_user_module,v 1.3 2008/08/19 23:44:48 espie Exp $
+--- modules/user/user.module.orig	Thu Aug 14 01:59:09 2008
++++ modules/user/user.module	Thu Aug 14 11:29:23 2008
 @@ -321,27 +321,7 @@ function user_validate_picture($file, &$edit, $user) {
   * Generate a random alphanumeric password.
   */
@@ -53,7 +53,7 @@ $OpenBSD: patch-modules_user_user_module,v 1.2 2008/07/26 10:34:01 espie Exp $
      );
    }
    if ($admin) {
-@@ -1825,6 +1809,10 @@ function user_admin_perm($rid = NULL) {
+@@ -1823,6 +1807,10 @@ function user_admin_perm($rid = NULL) {
    while ($role = db_fetch_object($result)) {
      $role_names[$role->rid] = $role->name;
    }
@@ -64,7 +64,7 @@ $OpenBSD: patch-modules_user_user_module,v 1.2 2008/07/26 10:34:01 espie Exp $
  
    // Render role/permission overview:
    $options = array();
-@@ -1864,7 +1852,12 @@ function theme_user_admin_perm($form) {
+@@ -1862,7 +1850,12 @@ function theme_user_admin_perm($form) {
        $row = array();
        // Module name
        if (is_numeric($key)) {
diff --git a/www/drupal5/core/pkg/PLIST b/www/drupal5/core/pkg/PLIST
index c5e3e23c9fb..da4edb95d2b 100644
--- a/www/drupal5/core/pkg/PLIST
+++ b/www/drupal5/core/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2008/03/16 10:15:28 espie Exp $
+@comment $OpenBSD: PLIST,v 1.6 2008/08/19 23:44:48 espie Exp $
 @owner ${DRUPAL_OWNER}
 @group ${DRUPAL_GROUP}
 ${DRUPAL_ROOT}/
@@ -107,6 +107,7 @@ ${DRUPAL_ROOT}/modules/blog/blog.info
 ${DRUPAL_ROOT}/modules/blog/blog.module
 ${DRUPAL_ROOT}/modules/blogapi/
 ${DRUPAL_ROOT}/modules/blogapi/blogapi.info
+${DRUPAL_ROOT}/modules/blogapi/blogapi.install
 ${DRUPAL_ROOT}/modules/blogapi/blogapi.module
 ${DRUPAL_ROOT}/modules/book/
 ${DRUPAL_ROOT}/modules/book/book.css
@@ -158,11 +159,11 @@ ${DRUPAL_ROOT}/modules/locale/locale.module
 ${DRUPAL_ROOT}/modules/menu/
 ${DRUPAL_ROOT}/modules/menu/menu.info
 ${DRUPAL_ROOT}/modules/menu/menu.module
-${DRUPAL_ROOT}/modules/node/
-${DRUPAL_ROOT}/modules/node/content_types.inc
-${DRUPAL_ROOT}/modules/node/node.css
-${DRUPAL_ROOT}/modules/node/node.info
-${DRUPAL_ROOT}/modules/node/node.module
+${DRUPAL_LOCALE}/
+${DRUPAL_LOCALE}/content_types.inc
+${DRUPAL_LOCALE}/node.css
+${DRUPAL_LOCALE}/node.info
+${DRUPAL_LOCALE}/node.module
 ${DRUPAL_ROOT}/modules/path/
 ${DRUPAL_ROOT}/modules/path/path.info
 ${DRUPAL_ROOT}/modules/path/path.module