diff --git a/cim-schema.changes b/cim-schema.changes
index 24c1d46..92cefea 100644
--- a/cim-schema.changes
+++ b/cim-schema.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Jan  8 14:06:27 MST 2008 - bart@novell.com
+
+- Updated to cimv2.17Experimental (#341800)
+
+-------------------------------------------------------------------
+Wed Nov 28 19:35:39 CET 2007 - bwhiteley@suse.de
+
+- Updated to cimv2.16Experimental (#341800)
+  Remove carriage returns from MOF files. 
+  Fix broken comment blocks in 2.16 schema. 
+
 -------------------------------------------------------------------
 Thu Mar 29 17:00:12 CEST 2007 - bwhiteley@suse.de
 
diff --git a/cim-schema.spec b/cim-schema.spec
index ec517fb..3d82c1a 100644
--- a/cim-schema.spec
+++ b/cim-schema.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cim-schema (Version 2.14)
+# spec file for package cim-schema (Version 2.17)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -11,19 +11,19 @@
 # norootforbuild
 
 Name:           cim-schema
-URL:            http://www.dmtf.org/
+%define cimver cimv217
+BuildRequires:  unzip
+Url:            http://www.dmtf.org/
 Summary:        Common Information Model (CIM) Schema
-Version:        2.14
+Version:        2.17
 Release:        1
 Group:          System/Management
 License:        Any permissive
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  unzip
-Source0:        http://www.dmtf.org/standards/cim/cim_schema_v214/cimv214Experimental-MOFs.zip
+Source0:        http://www.dmtf.org/standards/cim/cim_schema_v217/cimv217Experimental-MOFs.zip
 Source1:        loadmof.sh
 Source2:        rmmof.sh
-Source3:        cimv215-unreleased.tar.bz2
-BuildArch:    noarch
+BuildArch:      noarch
 
 %description
 Common Information Model (CIM) is a model for describing overall
@@ -46,22 +46,22 @@ Authors:
 %install
 MOFDIR=/usr/share/mof
 CIMDIR=$MOFDIR/cimv%{version}
-
+for i in `find . -name "*.mof"`; do
+  perl -p -i -e 's/\r//g' $i
+done
 %__rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/$CIMDIR
-perl -p -i -e 's/\\/\//g' cimv214.mof
+perl -p -i -e 's/\\/\//g' %{cimver}.mof
 echo "" >> qualifiers.mof
 echo "// Optional Qualifiers: " >> qualifiers.mof
 echo "" >> qualifiers.mof
 cat qualifiers_optional.mof >> qualifiers.mof
-
 %__rm qualifiers_optional.mof
 chmod -R go-wx .
 chmod -R a+rX .
-
 %__mv * $RPM_BUILD_ROOT/$CIMDIR/
 ln -s cimv%{version} $RPM_BUILD_ROOT/$MOFDIR/cim-current
-ln -s cimv214.mof $RPM_BUILD_ROOT/$MOFDIR/cim-current/CIM_Schema.mof
+ln -s %{cimver}.mof $RPM_BUILD_ROOT/$MOFDIR/cim-current/CIM_Schema.mof
 install -d $RPM_BUILD_ROOT/usr/bin
 install -m 755 %{S:1} $RPM_BUILD_ROOT/usr/bin/ 
 install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/bin/ 
@@ -69,8 +69,6 @@ perl -p -i -e 's~^#pragma include ("qualifiers_optional\.mof")~\/\/#pragma inclu
 perl -p -i -e \
 	's~^#pragma include \("qualifiers_optional\.mof"\)~\/\/#pragma include ("qualifiers_optional\.mof")~g' \
 	$RPM_BUILD_ROOT/$MOFDIR/cim-current/CIM_Schema.mof
-mkdir $RPM_BUILD_ROOT/$MOFDIR/cim-current/cimv2.15-unreleased
-tar jxv -C $RPM_BUILD_ROOT/$MOFDIR/cim-current/cimv2.15-unreleased -f %{S:3}
 
 %files
 %defattr(-, root, root)
@@ -82,6 +80,12 @@ tar jxv -C $RPM_BUILD_ROOT/$MOFDIR/cim-current/cimv2.15-unreleased -f %{S:3}
 /usr/bin/rmmof.sh
 
 %changelog
+* Tue Jan 08 2008 - bart@novell.com
+- Updated to cimv2.17Experimental (#341800)
+* Wed Nov 28 2007 - bwhiteley@suse.de
+- Updated to cimv2.16Experimental (#341800)
+  Remove carriage returns from MOF files.
+  Fix broken comment blocks in 2.16 schema.
 * Thu Mar 29 2007 - bwhiteley@suse.de
 - Added unzip to BuildRequires
 * Wed Mar 28 2007 - bwhiteley@suse.de
diff --git a/cimv214Experimental-MOFs.zip b/cimv214Experimental-MOFs.zip
deleted file mode 100644
index 72ba2c8..0000000
--- a/cimv214Experimental-MOFs.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fae50455529df499964930ebab7877beae2df7f58d0c32886bf8fc2bb33ee7bc
-size 1644130
diff --git a/cimv215-unreleased.tar.bz2 b/cimv215-unreleased.tar.bz2
deleted file mode 100644
index 7b4153f..0000000
--- a/cimv215-unreleased.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e8f71ed1230a1988569aa939369369f62a2d7954208b5bbc4f75583421a3605e
-size 8987
diff --git a/cimv217Experimental-MOFs.zip b/cimv217Experimental-MOFs.zip
new file mode 100644
index 0000000..1334356
--- /dev/null
+++ b/cimv217Experimental-MOFs.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:102d9e28fa6b0c987987c45608de48390caf77f8b91ad248ce62b73803cb14e2
+size 1779861
diff --git a/ready b/ready
index 473a0f4..14bc6b4 100644
--- a/ready
+++ b/ready
@@ -0,0 +1 @@
+bwhiteley submitted this package from Provo autobuild.