diff -r ad851d7abd43 -r 5789451435d6 open-src/common/Makefile.inc
--- a/open-src/common/Makefile.inc	Wed May 28 11:19:56 2014 -0700
+++ b/open-src/common/Makefile.inc	Tue Jun 10 18:34:17 2014 -0700
@@ -1,6 +1,6 @@
 # -*- Makefile -*- rules commonly shared among X consolidation open source dirs
 #
-# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -812,13 +812,13 @@
 UPSTREAM_URL_xorg	= http://www.x.org/
 SOURCE_URL_xorg		= $(XORG_RELEASES_URL)/$(SOURCE_TARBALL_DIR)/$(SOURCE_TARBALL_NAME)
 # TPNO's for X.Org software & font batches
-ORACLE_TPNO_xorg	= 11362
+ORACLE_TPNO_xorg	= 18028
 ORACLE_TPNO_xorg_fonts	= 11716
 
 UPSTREAM_xcb		= The XCB Project
 UPSTREAM_URL_xcb	= http://xcb.freedesktop.org/
 SOURCE_URL_xcb		= http://xcb.freedesktop.org/dist/$(SOURCE_TARBALL_NAME)
-ORACLE_TPNO_xcb		= 4914
+ORACLE_TPNO_xcb		= 18006
 
 UPSTREAM_PROJECT_DEFAULT	= $(UPSTREAM_PROJECT_SET:yes=$(POUND_SIGN))
 $(UPSTREAM_PROJECT_DEFAULT)	UPSTREAM_PROJECT = xorg