diff --git a/doc/html/changelog.html b/doc/html/changelog.html
index bbae9ab2..490956e7 100644
--- a/doc/html/changelog.html
+++ b/doc/html/changelog.html
@@ -143,13 +143,17 @@
 					<li>
 						libOggFLAC:
 						<ul>
-							<li>(none)</li>
+							<li><b>Added</b> OggFLAC__*_encoder_set_apodization()</li>
+							<li><b>Added</b> OggFLAC__metadata_object_cuesheet_calculate_cddb_id()</li>
+							<li><b>Added</b> OggFLAC__metadata_get_cuesheet()</li>
 						</ul>
 					</li>
 					<li>
 						libOggFLAC++:
 						<ul>
-							<li>(none)</li>
+							<li><b>Added</b> OggFLAC::*::Encoder::set_apodization()</li>
+							<li><b>Added</b> OggFLAC::Metadata::CueSheet::calculate_cddb_id()</li>
+							<li><b>Added</b> OggFLAC::Metadata::get_cuesheet()</li>
 						</ul>
 					</li>
 				</ul>
diff --git a/include/FLAC++/encoder.h b/include/FLAC++/encoder.h
index 1e176589..88768ae6 100644
--- a/include/FLAC++/encoder.h
+++ b/include/FLAC++/encoder.h
@@ -116,6 +116,7 @@ namespace FLAC {
 			bool set_bits_per_sample(unsigned value);
 			bool set_sample_rate(unsigned value);
 			bool set_blocksize(unsigned value);
+			bool set_apodization(const char *specification);
 			bool set_max_lpc_order(unsigned value);
 			bool set_qlp_coeff_precision(unsigned value);
 			bool set_do_qlp_coeff_prec_search(bool value);
@@ -214,6 +215,7 @@ namespace FLAC {
 			bool set_bits_per_sample(unsigned value);
 			bool set_sample_rate(unsigned value);
 			bool set_blocksize(unsigned value);
+			bool set_apodization(const char *specification);
 			bool set_max_lpc_order(unsigned value);
 			bool set_qlp_coeff_precision(unsigned value);
 			bool set_do_qlp_coeff_prec_search(bool value);
@@ -315,6 +317,7 @@ namespace FLAC {
 			bool set_bits_per_sample(unsigned value);
 			bool set_sample_rate(unsigned value);
 			bool set_blocksize(unsigned value);
+			bool set_apodization(const char *specification);
 			bool set_max_lpc_order(unsigned value);
 			bool set_qlp_coeff_precision(unsigned value);
 			bool set_do_qlp_coeff_prec_search(bool value);
diff --git a/include/OggFLAC++/encoder.h b/include/OggFLAC++/encoder.h
index b1248fc2..0c639377 100644
--- a/include/OggFLAC++/encoder.h
+++ b/include/OggFLAC++/encoder.h
@@ -119,6 +119,7 @@ namespace OggFLAC {
 			bool set_bits_per_sample(unsigned value);
 			bool set_sample_rate(unsigned value);
 			bool set_blocksize(unsigned value);
+			bool set_apodization(const char *specification);
 			bool set_max_lpc_order(unsigned value);
 			bool set_qlp_coeff_precision(unsigned value);
 			bool set_do_qlp_coeff_prec_search(bool value);
@@ -218,6 +219,7 @@ namespace OggFLAC {
 			bool set_bits_per_sample(unsigned value);
 			bool set_sample_rate(unsigned value);
 			bool set_blocksize(unsigned value);
+			bool set_apodization(const char *specification);
 			bool set_max_lpc_order(unsigned value);
 			bool set_qlp_coeff_precision(unsigned value);
 			bool set_do_qlp_coeff_prec_search(bool value);
@@ -321,6 +323,7 @@ namespace OggFLAC {
 			bool set_bits_per_sample(unsigned value);
 			bool set_sample_rate(unsigned value);
 			bool set_blocksize(unsigned value);
+			bool set_apodization(const char *specification);
 			bool set_max_lpc_order(unsigned value);
 			bool set_qlp_coeff_precision(unsigned value);
 			bool set_do_qlp_coeff_prec_search(bool value);
diff --git a/src/libFLAC++/file_encoder.cpp b/src/libFLAC++/file_encoder.cpp
index 0d6ac7aa..8074cd85 100644
--- a/src/libFLAC++/file_encoder.cpp
+++ b/src/libFLAC++/file_encoder.cpp
@@ -105,6 +105,12 @@ namespace FLAC {
 			return (bool)::FLAC__file_encoder_set_blocksize(encoder_, value);
 		}
 
+		bool File::set_apodization(const char *apodization)
+		{
+			FLAC__ASSERT(is_valid());
+			return (bool)::FLAC__file_encoder_set_apodization(encoder_, specification);
+		}
+
 		bool File::set_max_lpc_order(unsigned value)
 		{
 			FLAC__ASSERT(is_valid());
diff --git a/src/libFLAC++/seekable_stream_encoder.cpp b/src/libFLAC++/seekable_stream_encoder.cpp
index 9bc6d750..d08afc00 100644
--- a/src/libFLAC++/seekable_stream_encoder.cpp
+++ b/src/libFLAC++/seekable_stream_encoder.cpp
@@ -105,6 +105,12 @@ namespace FLAC {
 			return (bool)::FLAC__seekable_stream_encoder_set_blocksize(encoder_, value);
 		}
 
+		bool SeekableStream::set_apodization(const char *apodization)
+		{
+			FLAC__ASSERT(is_valid());
+			return (bool)::FLAC__seekable_stream_encoder_set_apodization(encoder_, specification);
+		}
+
 		bool SeekableStream::set_max_lpc_order(unsigned value)
 		{
 			FLAC__ASSERT(is_valid());
diff --git a/src/libFLAC++/stream_encoder.cpp b/src/libFLAC++/stream_encoder.cpp
index f7439dca..004558ca 100644
--- a/src/libFLAC++/stream_encoder.cpp
+++ b/src/libFLAC++/stream_encoder.cpp
@@ -106,6 +106,12 @@ namespace FLAC {
 			return (bool)::FLAC__stream_encoder_set_blocksize(encoder_, value);
 		}
 
+		bool Stream::set_apodization(const char *apodization)
+		{
+			FLAC__ASSERT(is_valid());
+			return (bool)::FLAC__stream_encoder_set_apodization(encoder_, specification);
+		}
+
 		bool Stream::set_max_lpc_order(unsigned value)
 		{
 			FLAC__ASSERT(is_valid());
diff --git a/src/libOggFLAC++/file_encoder.cpp b/src/libOggFLAC++/file_encoder.cpp
index 1607057e..ee921c06 100644
--- a/src/libOggFLAC++/file_encoder.cpp
+++ b/src/libOggFLAC++/file_encoder.cpp
@@ -111,6 +111,12 @@ namespace OggFLAC {
 			return (bool)::OggFLAC__file_encoder_set_blocksize(encoder_, value);
 		}
 
+		bool File::set_apodization(const char *specification)
+		{
+			FLAC__ASSERT(is_valid());
+			return (bool)::OggFLAC__file_encoder_set_apodization(encoder_, specification);
+		}
+
 		bool File::set_max_lpc_order(unsigned value)
 		{
 			FLAC__ASSERT(is_valid());
diff --git a/src/libOggFLAC++/seekable_stream_encoder.cpp b/src/libOggFLAC++/seekable_stream_encoder.cpp
index 31741cb5..e96bd162 100644
--- a/src/libOggFLAC++/seekable_stream_encoder.cpp
+++ b/src/libOggFLAC++/seekable_stream_encoder.cpp
@@ -111,6 +111,12 @@ namespace OggFLAC {
 			return (bool)::OggFLAC__seekable_stream_encoder_set_blocksize(encoder_, value);
 		}
 
+		bool SeekableStream::set_apodization(const char *specification)
+		{
+			FLAC__ASSERT(is_valid());
+			return (bool)::OggFLAC__seekable_stream_encoder_set_apodization(encoder_, specification);
+		}
+
 		bool SeekableStream::set_max_lpc_order(unsigned value)
 		{
 			FLAC__ASSERT(is_valid());
diff --git a/src/libOggFLAC++/stream_encoder.cpp b/src/libOggFLAC++/stream_encoder.cpp
index bf50dafe..183cf555 100644
--- a/src/libOggFLAC++/stream_encoder.cpp
+++ b/src/libOggFLAC++/stream_encoder.cpp
@@ -111,6 +111,12 @@ namespace OggFLAC {
 			return (bool)::OggFLAC__stream_encoder_set_blocksize(encoder_, value);
 		}
 
+		bool Stream::set_apodization(const char *specification)
+		{
+			FLAC__ASSERT(is_valid());
+			return (bool)::OggFLAC__stream_encoder_set_apodization(encoder_, specification);
+		}
+
 		bool Stream::set_max_lpc_order(unsigned value)
 		{
 			FLAC__ASSERT(is_valid());